diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java index f69ab16..7b9fa01 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java @@ -1,11 +1,8 @@ package com.bonus.zlpt.bigscreen.controller; -import com.bonus.zlpt.bigscreen.domain.vo.ColtdVo; -import com.bonus.zlpt.bigscreen.domain.vo.LonVo; +import com.bonus.zlpt.bigscreen.domain.vo.*; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; -import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo; -import com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo; import com.bonus.zlpt.bigscreen.service.BmCompanyInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -83,5 +80,16 @@ public class BmCompanyInfoController extends BaseController { } return success(map); } + + /** + * 根据时间查询设备历史经纬度 + * @param time + * @return + */ + @GetMapping("/time-list/{time}") + public AjaxResult timeList(@PathVariable("time") String time) { + List list = bmCompanyInfoService.selectTimeList(time); + return success(list); + } } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java index 087617f..a60d9b6 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java @@ -1,5 +1,6 @@ package com.bonus.zlpt.bigscreen.controller; +import com.bonus.zlpt.bigscreen.domain.vo.MaIdVo; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; import com.bonus.zlpt.bigscreen.domain.MaDevInfo; @@ -111,5 +112,17 @@ public class MaDevInfoController extends BaseController { List maHotInfos = maDevInfoService.selecthotList(); return success(maHotInfos); } + + /** + * 根据设备id查询设备详情相关信息 + * @param maId 设备id + * @return + */ + @GetMapping("/list/{maId}") + public AjaxResult listById(@PathVariable("maId") String maId) + { + MaIdVo maIdVo = maDevInfoService.selectListById(maId); + return success(maIdVo); + } } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/LatVo.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/LatVo.java new file mode 100644 index 0000000..6869964 --- /dev/null +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/LatVo.java @@ -0,0 +1,16 @@ +package com.bonus.zlpt.bigscreen.domain.vo; + +import lombok.Data; + +/** + * 经纬度返回类 + */ +@Data +public class LatVo { + + //经度 + private String lon; + + //纬度 + private String lat; +} diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/MaIdVo.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/MaIdVo.java new file mode 100644 index 0000000..3bab08b --- /dev/null +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/MaIdVo.java @@ -0,0 +1,25 @@ +package com.bonus.zlpt.bigscreen.domain.vo; + +import lombok.Data; + +/** + * 设备详情返回类 + */ +@Data +public class MaIdVo { + + //设备名称 + private String maName; + + //设备状态 + private String maStatus; + + //需求租赁单位 + private String needCompany; + + //设备计划进场时间 + private String planStartTime; + + //租赁时长 + private String duration; +} diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java index e8defc8..3ee50fa 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.bigscreen.mapper; import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo; import com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo; +import com.bonus.zlpt.bigscreen.domain.vo.LatVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -28,5 +29,11 @@ public interface BmCompanyInfoMapper { */ List selectColtdList(); + /** + * 根据时间查询设备历史经纬度 + * @param time + * @return + */ + List selectTimeList(String time); } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/MaDevInfoMapper.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/MaDevInfoMapper.java index 6684ff2..782c2e7 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/MaDevInfoMapper.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/MaDevInfoMapper.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.bigscreen.mapper; import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo; import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo; +import com.bonus.zlpt.bigscreen.domain.vo.MaIdVo; import com.bonus.zlpt.bigscreen.domain.vo.TypeVo; import org.apache.ibatis.annotations.Mapper; @@ -55,5 +56,11 @@ public interface MaDevInfoMapper { */ List selecthotList(); + /** + * 根据设备id查询设备详情相关信息 + * @param maId + * @return + */ + MaIdVo selectListById(String maId); } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java index d4c53a9..8ca955f 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.bigscreen.service; import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo; import com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo; +import com.bonus.zlpt.bigscreen.domain.vo.LatVo; import java.util.List; @@ -25,5 +26,12 @@ public interface BmCompanyInfoService { * @return */ List selectColtdList(); + + /** + * 根据时间查询设备历史经纬度 + * @param time + * @return + */ + List selectTimeList(String time); } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/MaDevInfoService.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/MaDevInfoService.java index 76c056e..6a4cf6a 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/MaDevInfoService.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/MaDevInfoService.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.bigscreen.service; import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo; import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo; +import com.bonus.zlpt.bigscreen.domain.vo.MaIdVo; import com.bonus.zlpt.bigscreen.domain.vo.TypeVo; import java.util.List; @@ -53,5 +54,11 @@ public interface MaDevInfoService { */ List selecthotList(); + /** + * 根据设备id查询设备详情相关信息 + * @param maId + * @return + */ + MaIdVo selectListById(String maId); } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java index ce837ce..bd850eb 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.bigscreen.service.impl; import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo; import com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo; +import com.bonus.zlpt.bigscreen.domain.vo.LatVo; import com.bonus.zlpt.bigscreen.mapper.BmCompanyInfoMapper; import com.bonus.zlpt.bigscreen.service.BmCompanyInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -39,5 +40,15 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService { public List selectColtdList() { return bmCompanyInfoMapper.selectColtdList(); } + + /** + * 根据时间查询设备历史经纬度 + * @param time + * @return + */ + @Override + public List selectTimeList(String time) { + return bmCompanyInfoMapper.selectTimeList(time); + } } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/MaDevInfoServiceImpl.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/MaDevInfoServiceImpl.java index f27cc7e..6d45694 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/MaDevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/MaDevInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.bigscreen.service.impl; import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo; import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo; +import com.bonus.zlpt.bigscreen.domain.vo.MaIdVo; import com.bonus.zlpt.bigscreen.domain.vo.TypeVo; import com.bonus.zlpt.bigscreen.mapper.MaDevInfoMapper; import com.bonus.zlpt.bigscreen.service.MaDevInfoService; @@ -78,5 +79,15 @@ public class MaDevInfoServiceImpl implements MaDevInfoService { public List selecthotList() { return maDevInfoMapper.selecthotList(); } + + /** + * 根据设备id查询设备详情相关信息 + * @param maId + * @return + */ + @Override + public MaIdVo selectListById(String maId) { + return maDevInfoMapper.selectListById(maId); + } } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml index 7a745fd..581451a 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml +++ b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml @@ -30,5 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + \ No newline at end of file diff --git a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml index 3778741..67fd6a1 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml +++ b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml @@ -51,4 +51,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY count DESC + + \ No newline at end of file diff --git a/zlpt-modules/zlpt-home/pom.xml b/zlpt-modules/zlpt-home/pom.xml index 0f9efaf..d9f8fcd 100644 --- a/zlpt-modules/zlpt-home/pom.xml +++ b/zlpt-modules/zlpt-home/pom.xml @@ -10,6 +10,16 @@ 4.0.0 zlpt-home + + + com.bonus.zlpt + zlpt-common-security + + + com.bonus.zlpt + zlpt-common-swagger + + 8 diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/Main.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/Main.java deleted file mode 100644 index 0f5eaaf..0000000 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bonus.zlpt; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/ZlptHomeApplication.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/ZlptHomeApplication.java new file mode 100644 index 0000000..46bde61 --- /dev/null +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/ZlptHomeApplication.java @@ -0,0 +1,18 @@ +package com.bonus.zlpt; + +import com.bonus.zlpt.common.security.annotation.EnableCustomConfig; +import com.bonus.zlpt.common.security.annotation.EnableRyFeignClients; +import com.bonus.zlpt.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class ZlptHomeApplication { + public static void main(String[] args) { + SpringApplication.run(ZlptHomeApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 首页模块启动成功 ლ(´ڡ`ლ)゙ \n" ); + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..30b0289 --- /dev/null +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmCarouselSetController.java @@ -0,0 +1,28 @@ +package com.bonus.zlpt.home.controller; + +import com.bonus.zlpt.home.service.BmCarouselSetService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + + +/** + * 轮播图配置(BmCarouselSet)表控制层 + * + * @author makejava + * @since 2023-12-03 15:24:10 + */ +@RestController +@RequestMapping("bmCarouselSet") +public class BmCarouselSetController { + /** + * 服务对象 + */ + @Autowired + private BmCarouselSetService bmCarouselSetService; + + + +} + 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 new file mode 100644 index 0000000..e216870 --- /dev/null +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/BmCarouselSetMapper.java @@ -0,0 +1,12 @@ +package com.bonus.zlpt.home.mapper; + +/** + * 轮播图配置(BmCarouselSet)表数据库访问层 + * + * @author makejava + * @since 2023-12-03 15:24:10 + */ +public interface BmCarouselSetMapper { + +} + 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 new file mode 100644 index 0000000..bcad895 --- /dev/null +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselSet.java @@ -0,0 +1,37 @@ +package pojo; + +import java.io.Serializable; +import lombok.Data; + +/** + * 轮播图配置(BmCarouselSet)表实体类 + * + * @author makejava + * @since 2023-12-03 15:24:10 + */ +@Data +@SuppressWarnings("serial") +public class BmCarouselSet { + + private Integer id; + //轮播图名称 + private String carName; + //轮播图图片地址 + private String carUrl; + //配置类型(0:资讯,1跳转地址)考虑用数据字典管理配置轮播图类型 + private String type; + //配置跳转地址 + private String openUrl; + //是否启用(0不启用,1启用) + private String status; + //创建时间 + private String createTime; + //创建人 + private String creator; + //排序 + private String sort; + //是否删除 + private String isActive; + +} + 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 new file mode 100644 index 0000000..2f60510 --- /dev/null +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/BmCarouselSetService.java @@ -0,0 +1,12 @@ +package com.bonus.zlpt.home.service; + +/** + * 轮播图配置(BmCarouselSet)表服务接口 + * + * @author makejava + * @since 2023-12-03 15:24:19 + */ +public interface BmCarouselSetService { + +} + 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 new file mode 100644 index 0000000..74be757 --- /dev/null +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/BmCarouselSetServiceImpl.java @@ -0,0 +1,16 @@ +package com.bonus.zlpt.home.service.impl; + +import com.bonus.zlpt.home.service.BmCarouselSetService; +import org.springframework.stereotype.Service; + +/** + * 轮播图配置(BmCarouselSet)表服务实现类 + * + * @author makejava + * @since 2023-12-03 15:24:19 + */ +@Service("bmCarouselSetService") +public class BmCarouselSetServiceImpl implements BmCarouselSetService { + +} +