From 3699da73e35b2c09cb33cef080c7ee3ba619e3ff Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 5 Dec 2023 15:28:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=8F=8A=E4=B8=93?= =?UTF-8?q?=E9=A2=98=E8=B5=84=E8=AE=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/equip/dto/InforMationDto.java | 16 +++ .../ServiceGreementInfoController.java | 109 ++++++++++++++++++ .../company/domain/ServiceGreementInfo.java | 41 +++++++ .../mapper/ServiceGreementInfoMapper.java | 71 ++++++++++++ .../service/ServiceGreementInfoService.java | 50 ++++++++ .../impl/ServiceGreementInfoServiceImpl.java | 79 +++++++++++++ .../mapper/ServiceGreementInfoMapper.xml | 71 ++++++++++++ .../equip/controller/DevInfoController.java | 14 +++ .../zlpt/equip/mapper/DevInfoMapper.java | 8 ++ .../zlpt/equip/service/IDevInfoService.java | 11 +- .../main/resources/mapper/DevInfoMapper.xml | 14 +++ .../controller/BmCarouselSetController.java | 24 ++-- .../controller/BmTopicInfoController.java | 15 +-- .../zlpt/home/mapper/BmCarouselSetMapper.java | 6 +- .../zlpt/home/mapper/BmTopicInfoMapper.java | 2 +- .../bonus/zlpt/home/pojo/BmCarouselDto.java | 22 ++++ .../bonus/zlpt/home/pojo/BmCarouselSet.java | 7 +- .../com/bonus/zlpt/home/pojo/BmTopicDto.java | 6 + .../home/service/BmCarouselSetService.java | 5 +- .../zlpt/home/service/BmTopicInfoService.java | 2 +- .../impl/BmCarouselSetServiceImpl.java | 7 +- .../service/impl/BmTopicInfoServiceImpl.java | 2 +- .../resources/mapper/BmCarouselSetMapper.xml | 25 ++-- .../resources/mapper/BmTopicInfoMapper.xml | 23 ++-- 24 files changed, 576 insertions(+), 54 deletions(-) create mode 100644 zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/dto/InforMationDto.java create mode 100644 zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java create mode 100644 zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/ServiceGreementInfo.java create mode 100644 zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/ServiceGreementInfoMapper.java create mode 100644 zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/ServiceGreementInfoService.java create mode 100644 zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/ServiceGreementInfoServiceImpl.java create mode 100644 zlpt-modules/zlpt-company/src/main/resources/mapper/ServiceGreementInfoMapper.xml create mode 100644 zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselDto.java diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/dto/InforMationDto.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/dto/InforMationDto.java new file mode 100644 index 0000000..72c682e --- /dev/null +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/dto/InforMationDto.java @@ -0,0 +1,16 @@ +package com.bonus.zlpt.common.core.domain.equip.dto; + +import com.bonus.zlpt.common.core.domain.equip.DevInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data + +public class InforMationDto extends DevInfo { + + + private String lon; + + private String lat; +} diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java new file mode 100644 index 0000000..16144d9 --- /dev/null +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java @@ -0,0 +1,109 @@ +package com.bonus.zlpt.company.controller; + +import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; +import com.bonus.zlpt.common.core.web.controller.BaseController; +import com.bonus.zlpt.common.core.web.domain.AjaxResult; +import com.bonus.zlpt.common.core.web.page.TableDataInfo; +import com.bonus.zlpt.company.domain.MaUserCollect; +import com.bonus.zlpt.company.domain.ServiceGreementInfo; +import com.bonus.zlpt.company.service.ServiceGreementInfoService; +import com.bonus.zlpt.home.pojo.BmCarouselDto; +import com.bonus.zlpt.home.pojo.BmCarouselSet; +import com.bonus.zlpt.home.pojo.BmTopicDto; +import com.bonus.zlpt.home.pojo.BmTopicInfo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + + +/** + * 隐私服务协议表(ServiceGreementInfo)表控制层 + * + * @author makejava + * @since 2023-12-04 16:32:02 + */ +@RestController +@RequestMapping("serviceGreementInfo") +public class ServiceGreementInfoController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ServiceGreementInfoService serviceGreementInfoService; + + /** + * 获取隐私协议模板列表 + * @param dto + * @return + */ + @PostMapping("/list") + public TableDataInfo getPrivacyAgreementTemplateList(@RequestBody ServiceGreementInfo dto) + { + startPage(dto.getPage(), dto.getPageSize()); + List list = serviceGreementInfoService.selectGreementInfoList(dto); + return getDataTable(list); + } + + /** + * 根据id查询隐私协议模板信息 + * @param id + * @return + */ + @GetMapping("/{id}") + public AjaxResult getListById(@PathVariable("id") int id) + { + return toAjax(serviceGreementInfoService.selectListById(id)); + } + + /** + * 新增隐私协议模板信息 + * @param dto + * @return + */ + @PostMapping("/add") + public AjaxResult addPrivacyAgreementTemplateList(@RequestBody ServiceGreementInfo dto) + { + serviceGreementInfoService.insertConfig(dto); + return success(); + } + + /** + * 导出隐私协议模板信息 + * @param response + * @param dto + */ + @PostMapping("/export") + public void expPrivacyAgreementTemplate(HttpServletResponse response, ServiceGreementInfo dto) + { + List list = serviceGreementInfoService.selectGreementInfoList(dto); + ExcelUtil util = new ExcelUtil(ServiceGreementInfo.class); + util.exportExcel(response, list, "隐私协议模板信息"); + } + + /** + * 编辑隐私协议模板信息 + * @param dto + * @return + */ + @PutMapping("/update") + public AjaxResult updatePrivacyAgreementTemplateList(@RequestBody ServiceGreementInfo dto) + { + serviceGreementInfoService.update(dto); + return success(); + } + + /** + * 根据id删除隐私协议模板 + * @param id + * @return + */ + @DeleteMapping("/{id}") + public AjaxResult delCarouselChartInfo(@PathVariable("id") int id) + { + serviceGreementInfoService.delete(id); + return success(); + } +} + diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/ServiceGreementInfo.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/ServiceGreementInfo.java new file mode 100644 index 0000000..79a47bb --- /dev/null +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/ServiceGreementInfo.java @@ -0,0 +1,41 @@ +package com.bonus.zlpt.company.domain; + +import java.util.Date; +import java.io.Serializable; +import lombok.Data; + +/** + * 服务协议表(ServiceGreementInfo)表实体类 + * + * @author makejava + * @since 2023-12-04 16:32:02 + */ +@Data +@SuppressWarnings("serial") +public class ServiceGreementInfo { + //协议id + private Integer serviceId; + + //隐私协议名称 + private String serviceName; + + //创建时间 + private Date createTime; + + //创建人 + private Integer userId; + + //协议状态(0 启用, 1 停用) + private String status; + + //协议url路径 + private String fileUrl; + + //页面 + private Integer page; + + //条数 + private Integer pageSize; + +} + diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/ServiceGreementInfoMapper.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/ServiceGreementInfoMapper.java new file mode 100644 index 0000000..861399b --- /dev/null +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/ServiceGreementInfoMapper.java @@ -0,0 +1,71 @@ +package com.bonus.zlpt.company.mapper; + +import com.bonus.zlpt.company.domain.ServiceGreementInfo; + +import java.util.List; + +/** + * 服务协议表(ServiceGreementInfo)表数据库访问层 + * + * @author makejava + * @since 2023-12-04 16:32:02 + */ +public interface ServiceGreementInfoMapper { + + /** + * 获取隐私协议模板列表 + * @param dto + * @return + */ + List selectGreementInfoList(ServiceGreementInfo dto); + + /** + * 根据id查询隐私协议模板信息 + * @param id + * @return + */ + int selectListById(int id); + + /** + * 新增隐私协议模板信息 + * @param dto + * @return + */ + void insertConfig(ServiceGreementInfo dto); + + /** + * 新增协议url路径 + * @param dto + * @return + */ + void insertAttachment(ServiceGreementInfo dto); + + /** + * 编辑隐私协议模板信息 + * @param dto + * @return + */ + void update(ServiceGreementInfo dto); + + /** + * 修改协议url路径 + * @param dto + * @return + */ + void updateAttachment(ServiceGreementInfo dto); + + /** + * 根据id删除隐私协议模板 + * @param id + * @return + */ + void delete(int id); + + /** + * 根据id删除隐私协议模板 + * @param id + * @return + */ + void deleteById(int id); +} + diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/ServiceGreementInfoService.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/ServiceGreementInfoService.java new file mode 100644 index 0000000..cd5ac9c --- /dev/null +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/ServiceGreementInfoService.java @@ -0,0 +1,50 @@ +package com.bonus.zlpt.company.service; + +import com.bonus.zlpt.company.domain.ServiceGreementInfo; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 服务协议表(ServiceGreementInfo)表服务接口 + * + * @author makejava + * @since 2023-12-04 16:32:06 + */ +public interface ServiceGreementInfoService { + + /** + * 获取隐私协议模板列表 + * @param dto + * @return + */ + List selectGreementInfoList(ServiceGreementInfo dto); + + /** + * 根据id查询隐私协议模板信息 + * @param id + * @return + */ + int selectListById(int id); + + /** + * 新增隐私协议模板信息 + * @param dto + * @return + */ + void insertConfig(ServiceGreementInfo dto); + + /** + * 编辑隐私协议模板信息 + * @param dto + */ + void update(ServiceGreementInfo dto); + + /** + * 根据id删除隐私协议模板 + * @param id + */ + void delete(int id); + +} + diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/ServiceGreementInfoServiceImpl.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/ServiceGreementInfoServiceImpl.java new file mode 100644 index 0000000..e019e51 --- /dev/null +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/ServiceGreementInfoServiceImpl.java @@ -0,0 +1,79 @@ +package com.bonus.zlpt.company.service.impl; + +import com.bonus.zlpt.company.domain.ServiceGreementInfo; +import com.bonus.zlpt.company.mapper.ServiceGreementInfoMapper; +import com.bonus.zlpt.company.service.ServiceGreementInfoService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 服务协议表(ServiceGreementInfo)表服务实现类 + * + * @author makejava + * @since 2023-12-04 16:32:06 + */ +@Service("serviceGreementInfoService") +public class ServiceGreementInfoServiceImpl implements ServiceGreementInfoService { + + @Resource + private ServiceGreementInfoMapper mapper; + + /** + * 获取隐私协议模板列表 + * @param dto + * @return + */ + @Override + public List selectGreementInfoList(ServiceGreementInfo dto) { + return mapper.selectGreementInfoList(dto); + } + + /** + * 根据id查询隐私协议模板信息 + * @param id + * @return + */ + @Override + public int selectListById(int id) { + return mapper.selectListById(id); + } + + /** + * 新增隐私协议模板信息 + * @param dto + * @return + */ + @Override + @Transactional + public void insertConfig(ServiceGreementInfo dto) { + mapper.insertConfig(dto); + mapper.insertAttachment(dto); + } + + /** + * 编辑隐私协议模板信息 + * @param dto + * @return + */ + @Override + public void update(ServiceGreementInfo dto) { + mapper.update(dto); + mapper.updateAttachment(dto); + } + + /** + * 根据id删除隐私协议模板 + * @param id + * @return + */ + @Override + public void delete(int id) { + mapper.delete(id); + mapper.deleteById(id); + } + +} + diff --git a/zlpt-modules/zlpt-company/src/main/resources/mapper/ServiceGreementInfoMapper.xml b/zlpt-modules/zlpt-company/src/main/resources/mapper/ServiceGreementInfoMapper.xml new file mode 100644 index 0000000..46eba3c --- /dev/null +++ b/zlpt-modules/zlpt-company/src/main/resources/mapper/ServiceGreementInfoMapper.xml @@ -0,0 +1,71 @@ + + + + + + insert into service_greement_info ( + service_id, + service_name, + user_id, + status, + create_time + )values( + #{serviceId}, + #{serviceName}, + #{userId}, + #{status}, + sysdate() + ) + + + + insert into sys_file_info ( + model_id, + file_url, + )values( + #{serviceId}, + #{fileUrl}, + ) + + + + update service_greement_info + + service_name = #{serviceName}, + userId = #{userId}, + status = #{status}, + + + + + update sys_file_info + + file_url = #{fileUrl}, + + + + + delete from service_greement_info + where service_id = #{id} + + + + delete from sys_file_info + where model_id = #{id} + + + + + + \ No newline at end of file diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java index 7cf6768..eed53a7 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.equip.controller; import java.util.List; +import com.bonus.zlpt.common.core.domain.equip.dto.InforMationDto; import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; import com.bonus.zlpt.common.core.web.controller.BaseController; @@ -96,4 +97,17 @@ public class DevInfoController extends BaseController { return toAjax(devInfoService.deleteDevInfoByMaIds(maIds)); } + + + /** + * 设备信息录入 + * @param inforMationDto + * @return + */ + @PostMapping("/insertInforMationDto") + public AjaxResult insertInforMationDto(@RequestBody InforMationDto inforMationDto) + { + return toAjax(devInfoService.insertInforMationDto(inforMationDto)); + } + } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java index 1a7a13f..8288723 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java @@ -3,7 +3,9 @@ package com.bonus.zlpt.equip.mapper; import java.util.List; import com.bonus.zlpt.common.core.domain.equip.DevInfo; +import com.bonus.zlpt.common.core.domain.equip.dto.InforMationDto; import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; +import org.apache.ibatis.annotations.Param; /** * 设备信息Mapper接口 @@ -71,5 +73,11 @@ public interface DevInfoMapper */ public int deleteDevInfoByMaIds(Long[] maIds); + /** + * 设备信息录入 + * @param inforMationDto + * @return + */ + int insertLon(@Param("dto") InforMationDto inforMationDto); } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java index 8effa1d..7a8bee6 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java @@ -1,9 +1,8 @@ package com.bonus.zlpt.equip.service; import java.util.List; -import java.util.Map; - import com.bonus.zlpt.common.core.domain.equip.DevInfo; +import com.bonus.zlpt.common.core.domain.equip.dto.InforMationDto; import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; /** @@ -70,5 +69,11 @@ public interface IDevInfoService */ public int deleteDevInfoByMaId(Long maId); - public Map sumType(); + /** + * 设备信息录入 + * @param inforMationDto + * @return + */ + int insertInforMationDto(InforMationDto inforMationDto); + } diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml index a593558..b88fe61 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml @@ -188,6 +188,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into gps_real_info + + gps_code, + lon, + lat, + + + #{dto.gpsCode}, + #{dto.lon}, + #{dto.lat}, + + + update ma_dev_info diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmCarouselSetController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmCarouselSetController.java index 680cc61..bf62eb2 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmCarouselSetController.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmCarouselSetController.java @@ -3,7 +3,8 @@ package com.bonus.zlpt.home.controller; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; import com.bonus.zlpt.common.core.web.page.TableDataInfo; - +import com.bonus.zlpt.common.security.utils.SecurityUtils; +import com.bonus.zlpt.home.pojo.BmCarouselDto; import com.bonus.zlpt.home.pojo.BmCarouselSet; import com.bonus.zlpt.home.service.BmCarouselSetService; import org.springframework.web.bind.annotation.*; @@ -26,18 +27,16 @@ public class BmCarouselSetController extends BaseController { @Resource private BmCarouselSetService bmCarouselSetService; - - /** * 获取轮播图列表 * @param * @return */ - @GetMapping("/list/{carName}/{beginTime}/{endTime}") - public TableDataInfo getCarouselChartList(@PathVariable("carName") String carName, @PathVariable("beginTime") String beginTime, @PathVariable("endTime") String endTime) + @PostMapping("/list") + public TableDataInfo getCarouselChartList(@RequestBody BmCarouselDto bmCarouselDto) { - startPage(); - List list = bmCarouselSetService.selectBmCarouseList(carName, beginTime, endTime); + startPage(bmCarouselDto.getPage(), bmCarouselDto.getPageSize()); + List list = bmCarouselSetService.selectBmCarouseList(bmCarouselDto); return getDataTable(list); } @@ -46,9 +45,11 @@ public class BmCarouselSetController extends BaseController { * @param bmCarouselSet * @return */ - @PostMapping + @PostMapping("/add") public AjaxResult addCarouselChartInfo(@RequestBody BmCarouselSet bmCarouselSet) { + Long userId = SecurityUtils.getUserId(); + bmCarouselSet.setCreator(userId.intValue()); return toAjax(bmCarouselSetService.insertConfig(bmCarouselSet)); } @@ -58,9 +59,10 @@ public class BmCarouselSetController extends BaseController { * @return */ @GetMapping("/{id}") - public AjaxResult getCarouselChartInfo(@PathVariable("id") String id) + public AjaxResult getCarouselChartInfo(@PathVariable("id") int id) { - return toAjax(bmCarouselSetService.selectListById(id)); + BmCarouselSet bmCarouselSet = bmCarouselSetService.selectListById(id); + return success(bmCarouselSet); } /** @@ -68,7 +70,7 @@ public class BmCarouselSetController extends BaseController { * @param bmCarouselSet * @return */ - @PutMapping + @PutMapping("/update") public AjaxResult updateCarouselChartInfo(@RequestBody BmCarouselSet bmCarouselSet) { return toAjax(bmCarouselSetService.update(bmCarouselSet)); diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmTopicInfoController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmTopicInfoController.java index 31c8159..a35e8a0 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmTopicInfoController.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmTopicInfoController.java @@ -5,7 +5,6 @@ import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; import com.bonus.zlpt.common.core.web.page.TableDataInfo; import com.bonus.zlpt.common.security.utils.SecurityUtils; -import com.bonus.zlpt.home.pojo.BmCarouselSet; import com.bonus.zlpt.home.pojo.BmTopicDto; import com.bonus.zlpt.home.pojo.BmTopicInfo; import com.bonus.zlpt.home.service.BmTopicInfoService; @@ -15,7 +14,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; - /** * 专题资讯表(BmTopicInfo)表控制层 * @@ -36,10 +34,10 @@ public class BmTopicInfoController extends BaseController { * @param bmTopicDto * @return */ - @GetMapping("/list") + @PostMapping("/list") public TableDataInfo getSpecialInfoList(@RequestBody BmTopicDto bmTopicDto) { - startPage(); + startPage(bmTopicDto.getPage(), bmTopicDto.getPageSize()); List list = bmTopicInfoService.selectSpecialInfoList(bmTopicDto); return getDataTable(list); } @@ -49,9 +47,11 @@ public class BmTopicInfoController extends BaseController { * @param bmTopicInfo * @return */ - @PostMapping + @PostMapping("/add") public AjaxResult addCarouselChartInfo(@RequestBody BmTopicInfo bmTopicInfo) { + Long userId = SecurityUtils.getUserId(); + bmTopicInfo.setCreator(userId.intValue()); return toAjax(bmTopicInfoService.insertConfig(bmTopicInfo)); } @@ -63,7 +63,8 @@ public class BmTopicInfoController extends BaseController { @GetMapping("/{id}") public AjaxResult getSpecialInfo(@PathVariable("id") String id) { - return toAjax(bmTopicInfoService.selectListById(id)); + BmTopicInfo bmTopicInfo = bmTopicInfoService.selectListById(id); + return success(bmTopicInfo); } /** @@ -71,7 +72,7 @@ public class BmTopicInfoController extends BaseController { * @param bmTopicInfo * @return */ - @PutMapping + @PutMapping("/update") public AjaxResult updateCarouselChartInfo(@RequestBody BmTopicInfo bmTopicInfo) { return toAjax(bmTopicInfoService.update(bmTopicInfo)); diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/BmCarouselSetMapper.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/BmCarouselSetMapper.java index ed0d504..a9234d3 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/BmCarouselSetMapper.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/BmCarouselSetMapper.java @@ -1,7 +1,7 @@ package com.bonus.zlpt.home.mapper; +import com.bonus.zlpt.home.pojo.BmCarouselDto; import com.bonus.zlpt.home.pojo.BmCarouselSet; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,7 +18,7 @@ public interface BmCarouselSetMapper { * @param * @return */ - List selectBmCarouseList(@Param("carName") String carName, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + List selectBmCarouseList(BmCarouselDto bmCarouselDto); /** * 新增轮播图信息 @@ -32,7 +32,7 @@ public interface BmCarouselSetMapper { * @param id * @return */ - int selectListById(String id); + BmCarouselSet selectListById(int id); /** * 编辑轮播图信息 diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/BmTopicInfoMapper.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/BmTopicInfoMapper.java index fd278fc..7ef2a66 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/BmTopicInfoMapper.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/BmTopicInfoMapper.java @@ -32,7 +32,7 @@ public interface BmTopicInfoMapper { * @param id * @return */ - int selectListById(String id); + BmTopicInfo selectListById(String id); /** * 编辑专题资讯信息 diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselDto.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselDto.java new file mode 100644 index 0000000..0089cf9 --- /dev/null +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselDto.java @@ -0,0 +1,22 @@ +package com.bonus.zlpt.home.pojo; + +import lombok.Data; + +@Data +public class BmCarouselDto { + + //轮播图名称 + private String carName; + + //开始时间 + private String beginTime; + + //结束时间 + private String endTime; + + //页面 + private Integer page; + + //条数 + private Integer pageSize; +} diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselSet.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselSet.java index 12072a3..09266c2 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselSet.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselSet.java @@ -40,9 +40,12 @@ public class BmCarouselSet { @Excel(name = "创建时间") private String createTime; - //创建人 + //创建人id @Excel(name = "创建人") - private String creator; + private Integer creator; + + //创建人 + private String createBy; //排序 @Excel(name = "排序") diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmTopicDto.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmTopicDto.java index 835e28b..a16c74b 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmTopicDto.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmTopicDto.java @@ -16,6 +16,12 @@ public class BmTopicDto { //结束时间 private String endTime; + + //页面 + private Integer page; + + //条数 + private Integer pageSize; } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/BmCarouselSetService.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/BmCarouselSetService.java index f975122..4b42c3e 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/BmCarouselSetService.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/BmCarouselSetService.java @@ -1,5 +1,6 @@ package com.bonus.zlpt.home.service; +import com.bonus.zlpt.home.pojo.BmCarouselDto; import com.bonus.zlpt.home.pojo.BmCarouselSet; import java.util.List; @@ -17,7 +18,7 @@ public interface BmCarouselSetService { * @param * @return */ - List selectBmCarouseList(String carName, String beginTime, String endTime); + List selectBmCarouseList(BmCarouselDto bmCarouselDto); /** * 新增轮播图信息 @@ -31,7 +32,7 @@ public interface BmCarouselSetService { * @param id * @return */ - int selectListById(String id); + BmCarouselSet selectListById(int id); /** * 编辑轮播图信息 diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/BmTopicInfoService.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/BmTopicInfoService.java index 65ce533..a63f77f 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/BmTopicInfoService.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/BmTopicInfoService.java @@ -32,7 +32,7 @@ public interface BmTopicInfoService { * @param id * @return */ - int selectListById(String id); + BmTopicInfo selectListById(String id); /** * 编辑专题资讯信息 diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/BmCarouselSetServiceImpl.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/BmCarouselSetServiceImpl.java index b6ef5d0..afe8b13 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/BmCarouselSetServiceImpl.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/BmCarouselSetServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.zlpt.home.service.impl; import com.bonus.zlpt.home.mapper.BmCarouselSetMapper; +import com.bonus.zlpt.home.pojo.BmCarouselDto; import com.bonus.zlpt.home.pojo.BmCarouselSet; import com.bonus.zlpt.home.service.BmCarouselSetService; import org.springframework.stereotype.Service; @@ -26,8 +27,8 @@ public class BmCarouselSetServiceImpl implements BmCarouselSetService { * @return */ @Override - public List selectBmCarouseList(String carName, String beginTime, String endTime) { - return bmCarouselSetMapper.selectBmCarouseList(carName, beginTime, endTime); + public List selectBmCarouseList(BmCarouselDto bmCarouselDto) { + return bmCarouselSetMapper.selectBmCarouseList(bmCarouselDto); } /** @@ -46,7 +47,7 @@ public class BmCarouselSetServiceImpl implements BmCarouselSetService { * @return */ @Override - public int selectListById(String id) { + public BmCarouselSet selectListById(int id) { return bmCarouselSetMapper.selectListById(id); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/BmTopicInfoServiceImpl.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/BmTopicInfoServiceImpl.java index 0d121fb..0a8e7f2 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/BmTopicInfoServiceImpl.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/BmTopicInfoServiceImpl.java @@ -46,7 +46,7 @@ public class BmTopicInfoServiceImpl implements BmTopicInfoService { * @return */ @Override - public int selectListById(String id) { + public BmTopicInfo selectListById(String id) { return bmTopicInfoMapper.selectListById(id); } diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml index e844d1f..c47446e 100644 --- a/zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml +++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/BmCarouselSetMapper.xml @@ -5,8 +5,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, car_name, car_url, type, open_url, status, create_time, creator, sort, is_active - from bm_carousel_set + select id, car_name, car_url, type, open_url, bc.status, bc.create_time, su.user_name AS createBy, sort, is_active + from bm_carousel_set bc + left join sys_user su on bc.creator = su.user_id @@ -15,29 +16,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" car_url, open_url, status, - creator, sort, - create_time + creator, + create_time, + is_active )values( #{carName}, #{carUrl}, #{openUrl}, #{status}, - #{creator}, #{sort}, - sysdate() + #{creator}, + sysdate(), + 1 ) update bm_carousel_set - id = #{id}, car_name = #{carName}, car_url = #{carUrl}, open_url = #{openUrl}, status = #{status}, + sort = #{sort}, + where id = #{id} @@ -48,17 +52,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - AND car_name like concat('%', #{carName}, '%') + AND bc.car_name like concat('%', #{carName}, '%') - and date_format( create_time, '%Y-%m-%d' ) + and date_format( bc.create_time, '%Y-%m-%d' ) BETWEEN date_format( #{beginTime}, '%Y-%m-%d' ) and date_format( #{endTime}, '%Y-%m-%d' ) + ORDER BY CASE WHEN sort IS NULL THEN 1 ELSE 0 END, sort - where id = #{id} diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml index dd18710..02c08e4 100644 --- a/zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml +++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/BmTopicInfoMapper.xml @@ -5,8 +5,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, topic_name, type, view_num, content, is_active, creator, create_time - from bm_topic_info + select id, topic_name, type, view_num, content, is_active, su.user_name AS creator, bt.create_time + from bm_topic_info bt + left join sys_user su on bt.creator = su.user_id @@ -15,34 +16,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" type, view_num, content, - creator, - create_time + create_time, + creator, + is_active )values( #{topicName}, #{type}, - #{openUrl}, + #{viewNum}, #{content}, - #{creator}, - sysdate() + sysdate(), + #{creator}, + 1 ) update bm_topic_info - id = #{id}, topic_name = #{topicName}, type = #{type}, view_num = #{viewNum}, content = #{content}, + where id = #{id} update bm_topic_info set is_active = '0' where id = #{id} - where id = #{id} @@ -54,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND topic_name like concat('%', #{topicName}, '%') - and date_format( create_time, '%Y-%m-%d' ) + and date_format( bt.create_time, '%Y-%m-%d' ) BETWEEN date_format( #{beginTime}, '%Y-%m-%d' ) and date_format( #{endTime}, '%Y-%m-%d' )