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

大屏接口修改

This commit is contained in:
mashuai 2023-12-09 16:37:28 +08:00
parent 5d6579fb82
commit 11ba920fcc
5 changed files with 64 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zlpt-modules/zlpt-bigScreen/pom.xml
View File

@ -82,6 +82,18 @@
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-security</artifactId>
</dependency>
<dependency>
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-api-equip</artifactId>
<version>3.6.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-api-company</artifactId>
<version>3.6.3</version>
<scope>compile</scope>
</dependency>
</dependencies>

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

@ -1,14 +1,14 @@
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.domain.vo.LonVo;
import com.bonus.zlpt.bigscreen.domain.vo.*;
import com.bonus.zlpt.bigscreen.mapper.BmCompanyInfoMapper;
import com.bonus.zlpt.bigscreen.service.BmCompanyInfoService;
import com.bonus.zlpt.company.api.enums.CompanyTypeEnum;
import com.bonus.zlpt.equip.api.enums.MaStatusEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -30,7 +30,13 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
*/
@Override
public List<CoTypeVo> selectTypeList() {
return bmCompanyInfoMapper.selectTypeList();
List<CoTypeVo> list = bmCompanyInfoMapper.selectTypeList();
ArrayList<CoTypeVo> typeVos = new ArrayList<>();
for (CoTypeVo coTypeVo : list) {
coTypeVo.setCoType(CompanyTypeEnum.getNameByCode(Integer.parseInt(coTypeVo.getCoType())));
typeVos.add(coTypeVo);
}
return typeVos;
}
/**
@ -39,7 +45,14 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
*/
@Override
public List<ColtdTypeVo> selectColtdList() {
return bmCompanyInfoMapper.selectColtdList();
List<ColtdTypeVo> list = bmCompanyInfoMapper.selectColtdList();
ArrayList<ColtdTypeVo> coltdTypeVos = new ArrayList<>();
for (ColtdTypeVo coltdTypeVo : list) {
coltdTypeVo.setMaStatus(MaStatusEnum.getNameByCode(Integer.parseInt(coltdTypeVo.getMaStatus())));
coltdTypeVo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(coltdTypeVo.getCompanyType())));
coltdTypeVos.add(coltdTypeVo);
}
return coltdTypeVos;
}
/**

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

@ -6,9 +6,12 @@ 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;
import com.bonus.zlpt.company.api.enums.CompanyLtdEnum;
import com.bonus.zlpt.equip.api.enums.MaStatusEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -29,7 +32,13 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
*/
@Override
public List<CoTypeVo> selectMaDevInfoList() {
return maDevInfoMapper.selectMaDevInfoList();
List<CoTypeVo> typeVos = maDevInfoMapper.selectMaDevInfoList();
List<CoTypeVo> coTypeVos = new ArrayList<>();
for (CoTypeVo typeVo : typeVos) {
typeVo.setCoType(CompanyLtdEnum.getNameByCode(Integer.parseInt(typeVo.getCoType())));
coTypeVos.add(typeVo);
}
return coTypeVos;
}
/**
@ -58,7 +67,13 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
*/
@Override
public List<TypeVo> selectTypeList() {
return maDevInfoMapper.selectTypeList();
List<TypeVo> list = maDevInfoMapper.selectTypeList();
ArrayList<TypeVo> typeVos = new ArrayList<>();
for (TypeVo typeVo : list) {
typeVo.setMaStatus(MaStatusEnum.getNameByCode(Integer.parseInt(typeVo.getMaStatus())));
typeVos.add(typeVo);
}
return typeVos;
}
/**
@ -68,7 +83,13 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
*/
@Override
public List<TypeVo> selectMaTypeList() {
return maDevInfoMapper.selectMaTypeList();
List<TypeVo> list = maDevInfoMapper.selectMaTypeList();
ArrayList<TypeVo> typeVos = new ArrayList<>();
for (TypeVo typeVo : list) {
typeVo.setMaStatus(MaStatusEnum.getNameByCode(Integer.parseInt(typeVo.getMaStatus())));
typeVos.add(typeVo);
}
return typeVos;
}
/**
@ -87,7 +108,9 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
*/
@Override
public MaIdVo selectListById(String maId) {
return maDevInfoMapper.selectListById(maId);
MaIdVo maIdVo = maDevInfoMapper.selectListById(maId);
maIdVo.setMaStatus(MaStatusEnum.getNameByCode(Integer.parseInt(maIdVo.getMaStatus())));
return maIdVo;
}
}

4
zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml
View File

@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTypeList" resultType="com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo">
SELECT company_type as coType, COUNT(*) AS count
FROM bm_company_info
WHERE company_type IN ('社会企业', '南网集团企业', '南网控股企业')
WHERE company_type IN ('2', '3', '4')
GROUP BY company_type
</select>
@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
JOIN bm_company_info c ON m.own_co = c.company_id
JOIN gps_real_info g ON m.gps_code = g.gps_code
WHERE
m.ma_status IN ('在租', '自有', '待租') and m.is_active = '1'
m.ma_status IN ('16', '17', '43') and m.is_active = '1'
GROUP BY
c.company_ltd, m.ma_status, g.lon, g.lat,maId

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

@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT bc.company_ltd AS coType, COUNT(*) AS Count
FROM ma_dev_info md
JOIN bm_company_info bc ON md.own_co = bc.company_id
WHERE md.ma_status = '自有' and md.is_active = '1'
WHERE md.ma_status = '43' and md.is_active = '1'
GROUP BY bc.company_ltd
</select>
@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT mti.type_name as ownCo, COUNT(*) as count
FROM ma_type_info mti
INNER JOIN ma_dev_info mdi ON mti.type_id = mdi.type_id
WHERE mdi.ma_status = '在租' and mdi.is_active = '1'
WHERE mdi.ma_status = '17' and mdi.is_active = '1'
GROUP BY mti.type_name
ORDER BY count DESC
</select>
@ -32,14 +32,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTypeList" resultType="com.bonus.zlpt.bigscreen.domain.vo.TypeVo">
SELECT ma_status as maStatus, COUNT(*) AS count
FROM ma_dev_info
WHERE ma_status IN ('自有', '待租') and is_active = '1'
WHERE ma_status IN ('43', '16') and is_active = '1'
GROUP BY ma_status
</select>
<select id="selectMaTypeList" resultType="com.bonus.zlpt.bigscreen.domain.vo.TypeVo">
SELECT ma_status as maStatus, COUNT(*) AS count
FROM ma_dev_info
WHERE ma_status IN ('在租', '待租') and is_active = '1'
WHERE ma_status IN ('16', '17') and is_active = '1'
GROUP BY ma_status
</select>