feat: 商品信息 & 竞品信息

fs-admin/src/main/java/com/fs/saler/CompetitorInfoController.java

@@ -0,0 +1,82 @@
+package com.fs.saler;
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.R;
+import com.fs.saler.domain.FsCompetitorInfo;
+import com.fs.saler.param.FsCompetitorInfoParam;
+import com.fs.saler.service.FsCompetitorInfoService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 竞品信息控制器
+ */
+@Api("竞品信息")
+@RestController
+@RequestMapping(value="/saler/competitorInfo")
+public class CompetitorInfoController extends BaseController {
+
+    @Autowired
+    private FsCompetitorInfoService competitorInfoService;
+
+    /**
+     * 分页查询竞品列表
+     */
+    @ApiOperation("查看竞品列表")
+    @PostMapping("/listPage")
+    public R listPage(@RequestBody FsCompetitorInfoParam param) {
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        List<FsCompetitorInfo> list = competitorInfoService.getAll(param);
+        PageInfo<FsCompetitorInfo> pageInfo = new PageInfo<>(list);
+        return R.ok().put("data", pageInfo);
+    }
+
+    /**
+     * 查看竞品详情
+     */
+    @ApiOperation("查看竞品详情")
+    @PostMapping("/findById")
+    public R findById(@RequestBody FsCompetitorInfoParam param) {
+        FsCompetitorInfo competitorInfo = competitorInfoService.getById(param.getId());
+        return R.ok().put("data", competitorInfo);
+    }
+
+    /**
+     * 新增竞品
+     */
+    @ApiOperation("新增竞品")
+    @PostMapping("/save")
+    public R save(@RequestBody FsCompetitorInfo competitorInfo) {
+        boolean result = competitorInfoService.save(competitorInfo);
+        return result ? R.ok() : R.error("新增竞品失败");
+    }
+
+    /**
+     * 更新竞品信息
+     */
+    @ApiOperation("更新竞品信息")
+    @PostMapping("/updateById")
+    public R updateById(@RequestBody FsCompetitorInfo competitorInfo) {
+        boolean result = competitorInfoService.update(competitorInfo);
+        return result ? R.ok() : R.error("更新竞品信息失败");
+    }
+
+    /**
+     * 删除竞品
+     */
+    @ApiOperation("删除竞品")
+    @PostMapping("/deleteById")
+    public R deleteById(@RequestBody FsCompetitorInfoParam param) {
+        boolean result = competitorInfoService.removeById(param.getId());
+        return result ? R.ok() : R.error("删除竞品失败");
+    }
+}

fs-service/src/main/java/com/fs/saler/mapper/FsCompetitorInfoMapper.java

@@ -1,6 +1,7 @@
 package com.fs.saler.mapper;
 
 import com.fs.saler.domain.FsCompetitorInfo;
+import com.fs.saler.param.FsCompetitorInfoParam;
 import org.apache.ibatis.annotations.*;
 import java.util.List;
 
@@ -15,14 +16,14 @@ public interface FsCompetitorInfoMapper {
      * @return 竞品信息
      */
     @Select("SELECT * FROM fs_competitor_info WHERE id = #{id}")
-    FsCompetitorInfo selectById(Integer id);
+    FsCompetitorInfo selectById(Long id);
 
     /**
      * 查询所有竞品信息
      * @return 竞品信息列表
      */
     @Select("SELECT * FROM fs_competitor_info")
-    List<FsCompetitorInfo> selectAll();
+    List<FsCompetitorInfo> selectAll(FsCompetitorInfoParam param);
 
     /**
      * 插入竞品信息
@@ -53,5 +54,5 @@ public interface FsCompetitorInfoMapper {
      * @return 影响行数
      */
     @Delete("DELETE FROM fs_competitor_info WHERE id = #{id}")
-    int deleteById(Integer id);
+    int deleteById(Long id);
 }

fs-service/src/main/java/com/fs/saler/param/FsCompetitorInfoParam.java

@@ -0,0 +1,64 @@
+package com.fs.saler.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class FsCompetitorInfoParam implements Serializable {
+    private Long id;
+    private Integer pageNum;
+    private Integer pageSize;
+
+    /**
+     * 竞品公司
+     */
+    private String competitorCompany;
+
+    /**
+     * 产品
+     */
+    private String product;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 服务
+     */
+    private String service;
+
+    /**
+     * 免费服务次数
+     */
+    private Integer freeServiceTimes;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+}

fs-service/src/main/java/com/fs/saler/service/FsCompetitorInfoService.java

@@ -1,6 +1,7 @@
 package com.fs.saler.service;
 
 import com.fs.saler.domain.FsCompetitorInfo;
+import com.fs.saler.param.FsCompetitorInfoParam;
 
 import java.util.List;
 
@@ -14,13 +15,13 @@ public interface FsCompetitorInfoService {
      * @param id 竞品ID
      * @return 竞品信息
      */
-    FsCompetitorInfo getById(Integer id);
+    FsCompetitorInfo getById(Long id);
 
     /**
      * 查询所有竞品信息
      * @return 竞品信息列表
      */
-    List<FsCompetitorInfo> getAll();
+    List<FsCompetitorInfo> getAll(FsCompetitorInfoParam param);
 
     /**
      * 新增竞品信息
@@ -41,5 +42,5 @@ public interface FsCompetitorInfoService {
      * @param id 竞品ID
      * @return 是否成功
      */
-    boolean removeById(Integer id);
+    boolean removeById(Long id);
 }

fs-service/src/main/java/com/fs/saler/service/impl/FsCompetitorInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.fs.saler.service.impl;
 
 import com.fs.saler.domain.FsCompetitorInfo;
 import com.fs.saler.mapper.FsCompetitorInfoMapper;
+import com.fs.saler.param.FsCompetitorInfoParam;
 import com.fs.saler.service.FsCompetitorInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,7 +23,7 @@ public class FsCompetitorInfoServiceImpl implements FsCompetitorInfoService {
      * @return 竞品信息
      */
     @Override
-    public FsCompetitorInfo getById(Integer id) {
+    public FsCompetitorInfo getById(Long id) {
         return fsCompetitorInfoMapper.selectById(id);
     }
 
@@ -31,8 +32,8 @@ public class FsCompetitorInfoServiceImpl implements FsCompetitorInfoService {
      * @return 竞品信息列表
      */
     @Override
-    public List<FsCompetitorInfo> getAll() {
-        return fsCompetitorInfoMapper.selectAll();
+    public List<FsCompetitorInfo> getAll(FsCompetitorInfoParam param) {
+        return fsCompetitorInfoMapper.selectAll(param);
     }
 
     /**
@@ -61,7 +62,7 @@ public class FsCompetitorInfoServiceImpl implements FsCompetitorInfoService {
      * @return 是否成功
      */
     @Override
-    public boolean removeById(Integer id) {
+    public boolean removeById(Long id) {
         return fsCompetitorInfoMapper.deleteById(id) > 0;
     }
 }

fs-user-app/src/main/java/com/fs/app/controller/CompetitorInfoController.java

@@ -0,0 +1,79 @@
+package com.fs.app.controller;
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.R;
+import com.fs.saler.domain.FsCompetitorInfo;
+import com.fs.saler.param.FsCompetitorInfoParam;
+import com.fs.saler.service.FsCompetitorInfoService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 竞品信息控制器
+ */
+@Api("竞品信息")
+@RestController
+@RequestMapping(value="/app/competitorInfo")
+public class CompetitorInfoController extends BaseController {
+
+    @Autowired
+    private FsCompetitorInfoService competitorInfoService;
+
+    /**
+     * 分页查询竞品列表
+     */
+    @ApiOperation("查看竞品列表")
+    @PostMapping("/listPage")
+    public R listPage(@RequestBody FsCompetitorInfoParam param) {
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        List<FsCompetitorInfo> list = competitorInfoService.getAll(param);
+        PageInfo<FsCompetitorInfo> pageInfo = new PageInfo<>(list);
+        return R.ok().put("data", pageInfo);
+    }
+
+    /**
+     * 查看竞品详情
+     */
+    @ApiOperation("查看竞品详情")
+    @PostMapping("/findById")
+    public R findById(@RequestBody FsCompetitorInfoParam param) {
+        FsCompetitorInfo competitorInfo = competitorInfoService.getById(param.getId());
+        return R.ok().put("data", competitorInfo);
+    }
+
+    /**
+     * 新增竞品
+     */
+    @ApiOperation("新增竞品")
+    @PostMapping("/save")
+    public R save(@RequestBody FsCompetitorInfo competitorInfo) {
+        boolean result = competitorInfoService.save(competitorInfo);
+        return result ? R.ok() : R.error("新增竞品失败");
+    }
+
+    /**
+     * 更新竞品信息
+     */
+    @ApiOperation("更新竞品信息")
+    @PostMapping("/updateById")
+    public R updateById(@RequestBody FsCompetitorInfo competitorInfo) {
+        boolean result = competitorInfoService.update(competitorInfo);
+        return result ? R.ok() : R.error("更新竞品信息失败");
+    }
+
+    /**
+     * 删除竞品
+     */
+    @ApiOperation("删除竞品")
+    @PostMapping("/deleteById")
+    public R deleteById(@RequestBody FsCompetitorInfoParam param) {
+        boolean result = competitorInfoService.removeById(param.getId());
+        return result ? R.ok() : R.error("删除竞品失败");
+    }
+}