bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏模块

This commit is contained in:
mashuai 2023-12-02 14:53:57 +08:00
parent 6a2259d048
commit 850ffe3957
26 changed files with 75 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zlpt-modules/pom.xml
View File

@ -15,7 +15,6 @@
<module>zlpt-file</module>
<module>zlpt-home</module>
<module>zlpt-bigScreen</module>
<module>zlpt-order</module>
</modules>
<artifactId>zlpt-modules</artifactId>
@ -56,7 +55,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.2.16</version>
<version>1.2.6</version>
</dependency>
</dependencies>
</project>

3
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/ZlptBigScreenApplication.java
View File

@ -15,9 +15,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
//
//
// @MapperScan("com.bonus.zlpt.bigscreen.mapper")
public class ZlptBigScreenApplication
{
public static void main(String[] args)

9
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java
View File

@ -2,11 +2,8 @@ package com.bonus.zlpt.bigscreen.controller;
import com.bonus.zlpt.common.core.web.controller.BaseController;
import com.bonus.zlpt.common.core.web.domain.AjaxResult;
import com.bonus.zlpt.bigscreen.domain.BmCompanyInfo;
import com.bonus.zlpt.bigscreen.domain.MaDevInfo;
import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo;
import com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo;
import com.bonus.zlpt.bigscreen.domain.vo.TypeVo;
import com.bonus.zlpt.bigscreen.service.BmCompanyInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -40,13 +37,13 @@ public class BmCompanyInfoController extends BaseController {
/**
* 根据企业类型查询对应数量
* @param bmCompanyInfo
* @param
* @return
*/
@GetMapping("/type-list")
public AjaxResult typeList(BmCompanyInfo bmCompanyInfo)
public AjaxResult typeList()
{
List<CoTypeVo> list = bmCompanyInfoService.selectTypeList(bmCompanyInfo);
List<CoTypeVo> list = bmCompanyInfoService.selectTypeList();
return success(list);
}

2
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmMachinistInfoController.java
View File

@ -2,13 +2,11 @@ package com.bonus.zlpt.bigscreen.controller;
import com.bonus.zlpt.common.core.web.controller.BaseController;
import com.bonus.zlpt.common.core.web.domain.AjaxResult;
import com.bonus.zlpt.system.api.domain.SysDept;
import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo;
import com.bonus.zlpt.bigscreen.service.BmMachinistInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**

18
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java
View File

@ -40,25 +40,25 @@ public class MaDevInfoController extends BaseController {
/**
* 根据类型查询设备总数
* @param maDevInfo
* @param
* @return
*/
@GetMapping("/type-list")
public AjaxResult typeList(MaDevInfo maDevInfo)
public AjaxResult typeList()
{
List<TypeVo> list = maDevInfoService.selectTypeList(maDevInfo);
List<TypeVo> list = maDevInfoService.selectTypeList();
return success(list);
}
/**
* 根据设备类型查询数量
* @param maDevInfo
* @param
* @return
*/
@GetMapping("/matype-list")
public AjaxResult maTypeList(MaDevInfo maDevInfo)
public AjaxResult maTypeList()
{
List<TypeVo> list = maDevInfoService.selectMaTypeList(maDevInfo);
List<TypeVo> list = maDevInfoService.selectMaTypeList();
return success(list);
}
@ -78,9 +78,9 @@ public class MaDevInfoController extends BaseController {
* @return
*/
@GetMapping("/ma-list")
public AjaxResult maList(MaDevInfo maDevInfo)
public AjaxResult maList()
{
List<CompanyInfoVo> maDevInfos = maDevInfoService.selectmaList(maDevInfo);
List<CompanyInfoVo> maDevInfos = maDevInfoService.selectmaList();
return success(maDevInfos);
}
@ -89,7 +89,7 @@ public class MaDevInfoController extends BaseController {
* @return
*/
@GetMapping("/hot-list")
public AjaxResult maList()
public AjaxResult hotList()
{
List<CompanyInfoVo> maHotInfos = maDevInfoService.selecthotList();
return success(maHotInfos);

2
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaLeaseInfoController.java
View File

@ -2,10 +2,8 @@ package com.bonus.zlpt.bigscreen.controller;
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;
import com.bonus.zlpt.bigscreen.domain.MaLeaseInfo;
import com.bonus.zlpt.bigscreen.domain.vo.MaLeaseInfoVo;
import com.bonus.zlpt.bigscreen.domain.vo.TypeVo;
import com.bonus.zlpt.bigscreen.service.MaLeaseInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

1
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaOrderInfoController.java
View File

@ -3,7 +3,6 @@ package com.bonus.zlpt.bigscreen.controller;
import com.bonus.zlpt.common.core.web.controller.BaseController;
import com.bonus.zlpt.common.core.web.domain.AjaxResult;
import com.bonus.zlpt.bigscreen.domain.MaOrderInfo;
import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo;
import com.bonus.zlpt.bigscreen.domain.vo.MaOrderInfoVo;
import com.bonus.zlpt.bigscreen.domain.vo.MaOrderVo;
import com.bonus.zlpt.bigscreen.service.MaOrderInfoService;

2
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/CoTypeVo.java
View File

@ -1,6 +1,8 @@
package com.bonus.zlpt.bigscreen.domain.vo;
import lombok.Data;
@Data
public class CoTypeVo
{
//企业类型

4
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/ColtdTypeVo.java
View File

@ -1,9 +1,11 @@
package com.bonus.zlpt.bigscreen.domain.vo;
import lombok.Data;
/**
* 企业所属返回类
*/
@Data
public class ColtdTypeVo {
//设备id
private String maId;

4
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/CompanyInfoVo.java
View File

@ -1,10 +1,12 @@
package com.bonus.zlpt.bigscreen.domain.vo;
import lombok.Data;
/**
* 企业机手返回类
*/
@Data
public class CompanyInfoVo {
//所属企业名称

3
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/MaDevVo.java
View File

@ -1,5 +1,8 @@
package com.bonus.zlpt.bigscreen.domain.vo;
import lombok.Data;
@Data
public class MaDevVo {
//设备名称

3
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/MaLeaseInfoVo.java
View File

@ -1,5 +1,8 @@
package com.bonus.zlpt.bigscreen.domain.vo;
import lombok.Data;
@Data
public class MaLeaseInfoVo {
//租赁类型

4
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/MaOrderInfoVo.java
View File

@ -1,9 +1,11 @@
package com.bonus.zlpt.bigscreen.domain.vo;
import lombok.Data;
/**
* 月份订单返回类
*/
@Data
public class MaOrderInfoVo {
//所属月份

3
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/MaOrderVo.java
View File

@ -1,5 +1,8 @@
package com.bonus.zlpt.bigscreen.domain.vo;
import lombok.Data;
@Data
public class MaOrderVo
{
//今日订单数量

3
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/TypeVo.java
View File

@ -1,5 +1,8 @@
package com.bonus.zlpt.bigscreen.domain.vo;
import lombok.Data;
@Data
public class TypeVo {
//设备状态

5
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java
View File

@ -1,6 +1,5 @@
package com.bonus.zlpt.bigscreen.mapper;
import com.bonus.zlpt.bigscreen.domain.BmCompanyInfo;
import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo;
import com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo;
import org.apache.ibatis.annotations.Mapper;
@ -24,10 +23,10 @@ public interface BmCompanyInfoMapper {
/**
* 根据企业类型查询对应数量
* @param bmCompanyInfo
* @param
* @return
*/
List<CoTypeVo> selectTypeList(BmCompanyInfo bmCompanyInfo);
List<CoTypeVo> selectTypeList();
/**
* 根据企业类型所属查询设备类型数量及经纬度

14
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/MaDevInfoMapper.java
View File

@ -1,8 +1,6 @@
package com.bonus.zlpt.bigscreen.mapper;
import com.bonus.zlpt.bigscreen.domain.MaDevInfo;
import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo;
import com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo;
import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo;
import com.bonus.zlpt.bigscreen.domain.vo.TypeVo;
import org.apache.ibatis.annotations.Mapper;
@ -26,10 +24,10 @@ public interface MaDevInfoMapper {
/**
* 查询设备状态为在租的设备名称及数量
* @param maDevInfo
* @param
* @return
*/
List<CompanyInfoVo> selectmaList(MaDevInfo maDevInfo);
List<CompanyInfoVo> selectmaList();
/**
* 查询平台入驻设备总数
@ -39,17 +37,17 @@ public interface MaDevInfoMapper {
/**
* 根据类型查询设备总数
* @param maDevInfo
* @param
* @return
*/
List<TypeVo> selectTypeList(MaDevInfo maDevInfo);
List<TypeVo> selectTypeList();
/**
* 根据设备类型查询数量
* @param maDevInfo
* @param
* @return
*/
List<TypeVo> selectMaTypeList(MaDevInfo maDevInfo);
List<TypeVo> selectMaTypeList();
/**
* 查询公司对应的热门设备数量

6
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java
View File

@ -1,7 +1,5 @@
package com.bonus.zlpt.bigscreen.service;
import com.bonus.zlpt.bigscreen.domain.BmCompanyInfo;
import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo;
import com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo;
@ -23,10 +21,10 @@ public interface BmCompanyInfoService {
/**
* 根据企业类型查询对应数量
* @param bmCompanyInfo
* @param
* @return
*/
List<CoTypeVo> selectTypeList(BmCompanyInfo bmCompanyInfo);
List<CoTypeVo> selectTypeList();
/**
* 根据企业类型所属查询设备类型数量及经纬度

14
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/MaDevInfoService.java
View File

@ -1,7 +1,5 @@
package com.bonus.zlpt.bigscreen.service;
import com.bonus.zlpt.common.core.web.domain.AjaxResult;
import com.bonus.zlpt.bigscreen.domain.MaDevInfo;
import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo;
import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo;
import com.bonus.zlpt.bigscreen.domain.vo.TypeVo;
@ -24,10 +22,10 @@ public interface MaDevInfoService {
/**
* 查询设备状态为在租的设备名称及数量
* @param maDevInfo
* @param
* @return
*/
List<CompanyInfoVo> selectmaList(MaDevInfo maDevInfo);
List<CompanyInfoVo> selectmaList();
/**
* 查询平台入驻设备总数
@ -37,17 +35,17 @@ public interface MaDevInfoService {
/**
* 根据类型查询设备总数
* @param maDevInfo
* @param
* @return
*/
List<TypeVo> selectTypeList(MaDevInfo maDevInfo);
List<TypeVo> selectTypeList();
/**
* 根据设备类型查询数量
* @param maDevInfo
* @param
* @return
*/
List<TypeVo> selectMaTypeList(MaDevInfo maDevInfo);
List<TypeVo> selectMaTypeList();
/**
* 查询公司对应的热门设备数量

7
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.bonus.zlpt.bigscreen.service.impl;
import com.bonus.zlpt.bigscreen.domain.BmCompanyInfo;
import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo;
import com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo;
import com.bonus.zlpt.bigscreen.mapper.BmCompanyInfoMapper;
@ -32,12 +31,12 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
/**
* 根据企业类型查询对应数量
* @param bmCompanyInfo
* @param
* @return
*/
@Override
public List<CoTypeVo> selectTypeList(BmCompanyInfo bmCompanyInfo) {
return bmCompanyInfoMapper.selectTypeList(bmCompanyInfo);
public List<CoTypeVo> selectTypeList() {
return bmCompanyInfoMapper.selectTypeList();
}
/**

19
zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/MaDevInfoServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.bonus.zlpt.bigscreen.service.impl;
import com.bonus.zlpt.bigscreen.domain.MaDevInfo;
import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo;
import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo;
import com.bonus.zlpt.bigscreen.domain.vo.TypeVo;
@ -34,12 +33,12 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
/**
* 查询设备状态为在租的设备名称及数量
* @param maDevInfo
* @param
* @return
*/
@Override
public List<CompanyInfoVo> selectmaList(MaDevInfo maDevInfo) {
return maDevInfoMapper.selectmaList(maDevInfo);
public List<CompanyInfoVo> selectmaList() {
return maDevInfoMapper.selectmaList();
}
/**
@ -53,22 +52,22 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
/**
* 根据类型查询设备总数
* @param maDevInfo
* @param
* @return
*/
@Override
public List<TypeVo> selectTypeList(MaDevInfo maDevInfo) {
return maDevInfoMapper.selectTypeList(maDevInfo);
public List<TypeVo> selectTypeList() {
return maDevInfoMapper.selectTypeList();
}
/**
* 根据设备类型查询数量
* @param maDevInfo
* @param
* @return
*/
@Override
public List<TypeVo> selectMaTypeList(MaDevInfo maDevInfo) {
return maDevInfoMapper.selectMaTypeList(maDevInfo);
public List<TypeVo> selectMaTypeList() {
return maDevInfoMapper.selectMaTypeList();
}
/**

6
zlpt-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmCompanyInfoMapper.xml → zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml
View File

@ -9,10 +9,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectTypeList" resultType="com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo">
SELECT co_type as coType, COUNT(*) AS count
SELECT company_type as coType, COUNT(*) AS count
FROM bm_company_info
WHERE co_type IN ('社会企业', '南网集团企业', '南网控股企业')
GROUP BY co_type
WHERE company_type IN ('社会企业', '南网集团企业', '南网控股企业')
GROUP BY company_type
</select>
<select id="selectColtdList" resultType="com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo">

6
zlpt-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmMachinistInfoMapper.xml → zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmMachinistInfoMapper.xml
View File

@ -5,10 +5,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.bonus.zlpt.bigscreen.mapper.BmMachinistInfoMapper">
<select id="selectMachinistInfoList" resultType="com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo">
SELECT c.co_ltd AS ownCo, COUNT(*) AS count
SELECT c.company_ltd AS ownCo, COUNT(*) AS count
FROM bm_company_info c
LEFT JOIN bm_machinist_info m ON c.co_name = m.own_co
GROUP BY c.co_ltd
LEFT JOIN bm_operator_info m ON c.company_name = m.own_co
GROUP BY c.company_ltd
</select>
</mapper>

8
zlpt-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaDevInfoMapper.xml → zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml
View File

@ -6,11 +6,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectMaDevInfoList" resultType="com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo">
SELECT bc.co_ltd AS title, COUNT(*) AS Count
SELECT bc.company_ltd AS title, COUNT(*) AS Count
FROM ma_dev_info md
JOIN bm_company_info bc ON md.own_co = bc.co_name
JOIN bm_company_info bc ON md.own_co = bc.company_id
WHERE md.ma_status = '自有'
GROUP BY bc.co_ltd
GROUP BY bc.company_ltd
</select>
@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selecthotList" resultType="com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo">
SELECT md.own_co AS ownCo, COUNT(*) AS count
FROM ma_hot_search hs
LEFT JOIN ma_dev_info md ON hs.ma_id = CAST(md.ma_id AS VARCHAR)
LEFT JOIN ma_dev_info md ON hs.ma_id = md.ma_id
GROUP BY md.own_co
ORDER BY count DESC
</select>

0
zlpt-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaLeaseInfoMapper.xml → zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaLeaseInfoMapper.xml
View File

2
zlpt-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaOrderInfoMapper.xml → zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaOrderInfoMapper.xml
View File

@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selecttodayList" resultType="com.bonus.zlpt.bigscreen.domain.vo.MaOrderVo">
SELECT COUNT(*) AS count,
SUM(money) AS money
SUM(cost) AS money
FROM ma_order_info
WHERE DATE(time) = CURDATE()
</select>