From 4538cf9f7b0b36f1087b4f7963b3d215c3583195 Mon Sep 17 00:00:00 2001 From: longbinbin <2284496322@qq.com> Date: Mon, 2 Dec 2024 16:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E5=AE=A2=E5=92=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=B8=E5=85=B3=E7=9A=84=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/pc/BrokerController.java | 56 +++++++++++++++++ .../basic/controller/pc/DeviceController.java | 55 ++++++++++++++++ .../ycwl/basic/mapper/pc/DeviceMapper.java | 5 +- .../model/common/BaseQueryParameterReq.java | 2 +- .../pc/device/req/DeviceAddOrUpdateReq.java | 28 +++++++++ .../model/pc/device/req/DeviceReqQuery.java | 1 + .../service/impl/pc/AdminUserServiceImpl.java | 2 +- .../service/impl/pc/BrokerServiceImpl.java | 62 +++++++++++++++++++ .../service/impl/pc/DeviceServiceImpl.java | 61 ++++++++++++++++++ .../service/impl/pc/RoleServiceImpl.java | 2 +- .../ycwl/basic/service/pc/BrokerService.java | 21 +++++++ .../ycwl/basic/service/pc/DeviceService.java | 23 +++++++ .../basic/service/pc/MerchantService.java | 4 -- 13 files changed, 313 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/ycwl/basic/controller/pc/BrokerController.java create mode 100644 src/main/java/com/ycwl/basic/controller/pc/DeviceController.java create mode 100644 src/main/java/com/ycwl/basic/model/pc/device/req/DeviceAddOrUpdateReq.java create mode 100644 src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java create mode 100644 src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java create mode 100644 src/main/java/com/ycwl/basic/service/pc/BrokerService.java create mode 100644 src/main/java/com/ycwl/basic/service/pc/DeviceService.java delete mode 100644 src/main/java/com/ycwl/basic/service/pc/MerchantService.java diff --git a/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java b/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java new file mode 100644 index 0000000..9e78d4c --- /dev/null +++ b/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java @@ -0,0 +1,56 @@ +package com.ycwl.basic.controller.pc; + +import com.ycwl.basic.model.pc.broker.entity.BrokerEntity; +import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery; +import com.ycwl.basic.service.pc.BrokerService; +import com.ycwl.basic.utils.ApiResponse; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @Author：longbinbin + * @Date：2024/12/2 15:50 + */ +@RestController +@RequestMapping("/api/broker/v1") +@Api(tags = "推客（推广人）管理") +public class BrokerController { + @Autowired + private BrokerService brokerService; + + @ApiOperation("分页查询") + @PostMapping("/page") + public ApiResponse page(@RequestBody BrokerReqQuery brokerReqQuery){ + return ApiResponse.buildSuccessResponse(brokerService.pageQuery(brokerReqQuery)); + } + + @ApiOperation("列表查询") + @PostMapping("/list") + public ApiResponse list(@RequestBody BrokerReqQuery brokerReqQuery){ + return ApiResponse.buildSuccessResponse(brokerService.list(brokerReqQuery)); + } + + @ApiOperation("详情查询") + @GetMapping("/getDetails/{id}") + public ApiResponse getDetails(@PathVariable("id") Long id){ + return ApiResponse.buildSuccessResponse(brokerService.getById(id)); + } + @ApiOperation("新增或修改") + @PostMapping("/addOrUpdate") + public ApiResponse addOrUpdate(@RequestBody BrokerEntity broker){ + return ApiResponse.buildSuccessResponse(brokerService.addOrUpdate(broker)); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{id}") + public ApiResponse delete(@PathVariable("id") Long id){ + return ApiResponse.buildSuccessResponse(brokerService.delete(id)); + } + @ApiOperation("修改状态") + @PutMapping("/updateStatus/{id}") + public ApiResponse updateStatus(@PathVariable("id") Long id){ + return ApiResponse.buildSuccessResponse(brokerService.updateStatus(id)); + } + +} diff --git a/src/main/java/com/ycwl/basic/controller/pc/DeviceController.java b/src/main/java/com/ycwl/basic/controller/pc/DeviceController.java new file mode 100644 index 0000000..b4b04eb --- /dev/null +++ b/src/main/java/com/ycwl/basic/controller/pc/DeviceController.java @@ -0,0 +1,55 @@ +package com.ycwl.basic.controller.pc; + +import com.github.pagehelper.PageInfo; +import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq; +import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; +import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; +import com.ycwl.basic.service.pc.DeviceService; +import com.ycwl.basic.utils.ApiResponse; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @Author：longbinbin + * @Date：2024/12/2 16:13 + */ +@RestController +@RequestMapping("/api/device/v1") +@Api(tags = "设备管理") +public class DeviceController { + @Autowired + private DeviceService deviceService; + + @ApiOperation("分页查询") + @PostMapping("/page") + public ApiResponse> pageQuery(@RequestBody DeviceReqQuery deviceReqQuery) { + return deviceService.pageQuery(deviceReqQuery); + } + @ApiOperation("列表查询") + @PostMapping("/list") + public ApiResponse list(@RequestBody DeviceReqQuery deviceReqQuery) { + return deviceService.list(deviceReqQuery); + } + @ApiOperation("详情查询") + @GetMapping("/getDetails/{id}") + public ApiResponse getDetails(@PathVariable("id") Long id) { + return deviceService.getById(id); + } + @ApiOperation("新增或修改") + @PostMapping("/addOrUpdate") + public ApiResponse addOrUpdate(@RequestBody DeviceAddOrUpdateReq deviceReqQuery) { + return deviceService.addOrUpdate(deviceReqQuery); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{id}") + public ApiResponse delete(@PathVariable("id") Long id) { + return deviceService.deleteById(id); + } + @ApiOperation("修改状态") + @PutMapping("/updateStatus/{id}") + public ApiResponse updateStatus(@PathVariable("id") Long id) { + return deviceService.updateStatus(id); + } +} diff --git a/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java index cd69b5b..569a22e 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/DeviceMapper.java @@ -1,6 +1,7 @@ package com.ycwl.basic.mapper.pc; import com.ycwl.basic.model.pc.device.entity.DeviceEntity; +import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq; import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; import org.apache.ibatis.annotations.Mapper; @@ -16,8 +17,8 @@ import java.util.List; public interface DeviceMapper { List list(DeviceReqQuery deviceReqQuery); DeviceRespVO getById(Long id); - int add(DeviceEntity device); + int add(DeviceAddOrUpdateReq deviceReqQuery); int deleteById(Long id); - int update(DeviceEntity device); + int update(DeviceAddOrUpdateReq deviceReqQuery); int updateStatus(Long id); } diff --git a/src/main/java/com/ycwl/basic/model/common/BaseQueryParameterReq.java b/src/main/java/com/ycwl/basic/model/common/BaseQueryParameterReq.java index 5b3e391..c370d94 100644 --- a/src/main/java/com/ycwl/basic/model/common/BaseQueryParameterReq.java +++ b/src/main/java/com/ycwl/basic/model/common/BaseQueryParameterReq.java @@ -12,7 +12,7 @@ import lombok.Data; public class BaseQueryParameterReq { @ApiModelProperty(value = "当前页数") - private Integer page = 1; + private Integer pageNum = 1; @ApiModelProperty(value = "每页条数") private Integer pageSize = 10; diff --git a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceAddOrUpdateReq.java b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceAddOrUpdateReq.java new file mode 100644 index 0000000..948b7cc --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceAddOrUpdateReq.java @@ -0,0 +1,28 @@ +package com.ycwl.basic.model.pc.device.req; + +import com.ycwl.basic.model.common.BaseQueryParameterReq; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author：longbinbin + * @Date：2024/11/29 14:53 + */ +@Data +@ApiModel("设备新增修改参数") +public class DeviceAddOrUpdateReq { + private Long id; + @ApiModelProperty("景区id") + private Long scenicId; + @ApiModelProperty("设备名称") + private String name; + @ApiModelProperty("设备编号") + private String no; + @ApiModelProperty("是否启用，0不启用，1启用") + private Integer status; + @ApiModelProperty("是否在线，0不在线，1在线") + private Integer online; +} diff --git a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java index e9a05b8..5495431 100644 --- a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java @@ -15,6 +15,7 @@ import java.util.Date; @Data @ApiModel("设备查询参数") public class DeviceReqQuery extends BaseQueryParameterReq { + @ApiModelProperty("景区id") private Long scenicId; @ApiModelProperty("设备名称") diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java index a9b8660..3d22230 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java @@ -48,7 +48,7 @@ public class AdminUserServiceImpl implements AdminUserService { @Override public ApiResponse list(AdminUserListReqVO adminUserListReqVO) { - PageHelper.startPage(adminUserListReqVO.getPage(), adminUserListReqVO.getPageSize()); + PageHelper.startPage(adminUserListReqVO.getPageNum(), adminUserListReqVO.getPageSize()); List list = adminUserMapper.list(adminUserListReqVO); PageInfo pageInfo = new PageInfo(list); return ApiResponse.buildSuccessResponse(pageInfo); diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java new file mode 100644 index 0000000..6c1a4f1 --- /dev/null +++ b/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java @@ -0,0 +1,62 @@ +package com.ycwl.basic.service.impl.pc; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.ycwl.basic.mapper.pc.BrokerMapper; +import com.ycwl.basic.model.pc.broker.entity.BrokerEntity; +import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery; +import com.ycwl.basic.model.pc.broker.resp.BrokerRespVO; +import com.ycwl.basic.service.pc.BrokerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：longbinbin + * @Date：2024/12/2 15:55 + */ +@Service +public class BrokerServiceImpl implements BrokerService { + + @Autowired + private BrokerMapper brokerMapper; + + @Override + public PageInfo pageQuery(BrokerReqQuery brokerReqQuery) { + PageHelper.startPage(brokerReqQuery.getPageNum(),brokerReqQuery.getPageSize()); + List list = brokerMapper.list(brokerReqQuery); + PageInfo pageInfo = new PageInfo(list); + return pageInfo; + } + + @Override + public List list(BrokerReqQuery brokerReqQuery) { + return brokerMapper.list(brokerReqQuery); + } + + @Override + public BrokerEntity getById(Long id) { + return brokerMapper.getById(id); + } + + @Override + public int addOrUpdate(BrokerEntity broker) { + Long id = broker.getId(); + if(id==null){ + return brokerMapper.add(broker); + }else { + return brokerMapper.update(broker); + } + } + + @Override + public int delete(Long id) { + return brokerMapper.deleteById(id); + } + + @Override + public int updateStatus(Long id) { + return brokerMapper.updateStatus(id); + } +} diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java new file mode 100644 index 0000000..60c87e8 --- /dev/null +++ b/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java @@ -0,0 +1,61 @@ +package com.ycwl.basic.service.impl.pc; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.ycwl.basic.mapper.pc.DeviceMapper; +import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq; +import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; +import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; +import com.ycwl.basic.service.pc.DeviceService; +import com.ycwl.basic.utils.ApiResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：longbinbin + * @Date：2024/12/2 16:18 + */ +@Service +public class DeviceServiceImpl implements DeviceService { + @Autowired + private DeviceMapper deviceMapper; + @Override + public ApiResponse> pageQuery(DeviceReqQuery deviceReqQuery) { + PageHelper.startPage(deviceReqQuery.getPageNum(), deviceReqQuery.getPageSize()); + List list = deviceMapper.list(deviceReqQuery); + PageInfo pageInfo = new PageInfo<>(list); + return ApiResponse.buildSuccessResponse(pageInfo); + } + + @Override + public ApiResponse> list(DeviceReqQuery deviceReqQuery) { + return ApiResponse.buildSuccessResponse(deviceMapper.list(deviceReqQuery)); + } + + @Override + public ApiResponse getById(Long id) { + return ApiResponse.buildSuccessResponse(deviceMapper.getById(id)); + } + + @Override + public ApiResponse addOrUpdate(DeviceAddOrUpdateReq deviceReqQuery) { + Long id = deviceReqQuery.getId(); + if (id == null) { + return ApiResponse.buildSuccessResponse(deviceMapper.add(deviceReqQuery)); + } else { + return ApiResponse.buildSuccessResponse(deviceMapper.update(deviceReqQuery)); + } + } + + @Override + public ApiResponse deleteById(Long id) { + return ApiResponse.buildSuccessResponse(deviceMapper.deleteById(id)); + } + + @Override + public ApiResponse updateStatus(Long id) { + return ApiResponse.buildSuccessResponse(deviceMapper.updateStatus(id)); + } +} diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java index 1f1c319..eeaa44a 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java @@ -36,7 +36,7 @@ public class RoleServiceImpl implements RoleService { @Override public ApiResponse list(RoleListReqVO roleListReqVO) { - PageHelper.startPage(roleListReqVO.getPage(),roleListReqVO.getPageSize()); + PageHelper.startPage(roleListReqVO.getPageNum(),roleListReqVO.getPageSize()); // if(roleListReqVO.getType()==null){ // roleListReqVO.setType(0); // } diff --git a/src/main/java/com/ycwl/basic/service/pc/BrokerService.java b/src/main/java/com/ycwl/basic/service/pc/BrokerService.java new file mode 100644 index 0000000..b4d0725 --- /dev/null +++ b/src/main/java/com/ycwl/basic/service/pc/BrokerService.java @@ -0,0 +1,21 @@ +package com.ycwl.basic.service.pc; + +import com.github.pagehelper.PageInfo; +import com.ycwl.basic.model.pc.broker.entity.BrokerEntity; +import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery; +import com.ycwl.basic.model.pc.broker.resp.BrokerRespVO; + +import java.util.List; + +/** + * @Author：longbinbin + * @Date：2024/12/2 15:54 + */ +public interface BrokerService { + PageInfo pageQuery(BrokerReqQuery brokerReqQuery); + List list(BrokerReqQuery brokerReqQuery); + BrokerEntity getById(Long id); + int addOrUpdate(BrokerEntity broker); + int delete(Long id); + int updateStatus(Long id); +} diff --git a/src/main/java/com/ycwl/basic/service/pc/DeviceService.java b/src/main/java/com/ycwl/basic/service/pc/DeviceService.java new file mode 100644 index 0000000..b3e5b5e --- /dev/null +++ b/src/main/java/com/ycwl/basic/service/pc/DeviceService.java @@ -0,0 +1,23 @@ +package com.ycwl.basic.service.pc; + +import com.github.pagehelper.PageInfo; +import com.ycwl.basic.model.pc.device.req.DeviceAddOrUpdateReq; +import com.ycwl.basic.model.pc.device.req.DeviceReqQuery; +import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; +import com.ycwl.basic.utils.ApiResponse; + +import java.util.List; + +/** + * @Author：longbinbin + * @Date：2024/12/2 16:14 + * 设备管理 + */ +public interface DeviceService { + ApiResponse> pageQuery(DeviceReqQuery deviceReqQuery); + ApiResponse> list(DeviceReqQuery deviceReqQuery); + ApiResponse getById(Long id); + ApiResponse addOrUpdate(DeviceAddOrUpdateReq deviceReqQuery); + ApiResponse deleteById(Long id); + ApiResponse updateStatus(Long id); +} diff --git a/src/main/java/com/ycwl/basic/service/pc/MerchantService.java b/src/main/java/com/ycwl/basic/service/pc/MerchantService.java deleted file mode 100644 index f369605..0000000 --- a/src/main/java/com/ycwl/basic/service/pc/MerchantService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ycwl.basic.service.pc; - -public interface MerchantService { -}