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

Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev

This commit is contained in:
sxu 2023-12-10 02:14:28 +08:00
parent bc1debe0a3 bd902fd6aa
commit ba1030d27c
10 changed files with 87 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/RemoteDevInfoService.java
View File

@ -28,8 +28,8 @@ public interface RemoteDevInfoService
* @param typeInfo
* @param typeInfo
*/
@PostMapping("/dev")
void add(@RequestBody TypeInfo typeInfo);
@PostMapping("/dev/outType")
void add(@RequestBody String typeInfo);
}

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

@ -15,9 +15,9 @@ public class TestVo {
private static Set<String> set = new TreeSet<>();
static {
set.add("自有");
set.add("待租");
set.add("在租");
set.add("16");
set.add("17");
set.add("43");
}
public TestVo(){

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

@ -46,13 +46,8 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
@Override
public List<ColtdTypeVo> 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;
return list;
}
/**

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

@ -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 ('16', '17', '43') 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

6
zlpt-modules/zlpt-equip/pom.xml
View File

@ -92,6 +92,12 @@
<artifactId>zlpt-api-equip</artifactId>
<version>3.6.3</version>
</dependency>
<dependency>
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-api-company</artifactId>
<version>3.6.3</version>
<scope>compile</scope>
</dependency>
<!-- RuoYi Common Swagger -->

12
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import com.bonus.zlpt.equip.api.domain.DevInfo;
import com.bonus.zlpt.equip.api.domain.TypeInfo;
import com.bonus.zlpt.equip.api.domain.dto.InforMationDto;
import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo;
import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
@ -166,4 +167,15 @@ public class DevInfoController extends BaseController
List<DevInfoVo> list = devInfoService.selectDevInfoLists(devInfo);
return getDataTable(list);
}
/**
* 添加设备
* @param devInfo
* @param devInfo
*/
@ApiOperation(value = "查询商品列表")
@PostMapping("/outType")
public void outType(@RequestBody String devInfo){
devInfoService.insertOutType(devInfo);
}
}

7
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/SysFileInfoMapper.java
View File

@ -2,8 +2,11 @@ package com.bonus.zlpt.equip.mapper;
import com.bonus.zlpt.company.api.domain.BmCompanyInfo;
import com.bonus.zlpt.equip.api.domain.SysFileInfo;
import com.bonus.zlpt.equip.api.domain.TypeInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -15,4 +18,8 @@ public interface SysFileInfoMapper {
List<SysFileInfo> selectByMaId(Long maId);
void insertFileInfo(SysFileInfo fileInfo);
BmCompanyInfo getBmCompanyInfo(@Param("companyName") String companyName);
TypeInfo getTypeInfo(@Param("deviceName") String deviceName);
}

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
View File

@ -78,4 +78,6 @@ public interface IDevInfoService
public Map<String, Integer> sumType();
List<DevInfoVo> selectDevInfoLists(DevInfoVo devInfo);
void insertOutType(String devInfo);
}

45
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
View File

@ -4,17 +4,23 @@ import java.util.*;
import java.util.stream.Collectors;
import com.bonus.zlpt.common.security.utils.SecurityUtils;
import com.bonus.zlpt.company.api.domain.BmCompanyInfo;
import com.bonus.zlpt.equip.api.domain.DevInfo;
import com.bonus.zlpt.equip.api.domain.SysFileInfo;
import com.bonus.zlpt.equip.api.domain.TypeInfo;
import com.bonus.zlpt.equip.api.domain.UserCollect;
import com.bonus.zlpt.equip.api.domain.dto.InforMationDto;
import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo;
import com.bonus.zlpt.common.core.domain.system.SysFile;
import com.bonus.zlpt.common.core.utils.DateUtils;
import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
import com.bonus.zlpt.equip.api.enums.MaStatusEnum;
import com.bonus.zlpt.system.api.domain.BaseAddress;
import com.bonus.zlpt.system.api.domain.SysDic;
import com.bonus.zlpt.system.api.model.LoginUser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import com.bonus.zlpt.equip.mapper.SysFileInfoMapper;
@ -320,4 +326,43 @@ public class DevInfoServiceImpl implements IDevInfoService
}
return list;
}
@Override
public void insertOutType(String devInfo) {
ObjectMapper objectMapper = new ObjectMapper();
try {
Map<String, Object> map = objectMapper.readValue(devInfo, new TypeReference<Map<String, Object>>() {});
//获取公司名称
String companyName = (String) map.get("companyName");
//根据公司名称获取公司ID
BmCompanyInfo bmCompanyInfo = sysFileInfoMapper.getBmCompanyInfo(companyName);
//获取设备类型名称
String deviceName = (String) map.get("deviceName");
//根据设备类型名称获取设备类型ID
TypeInfo typeInfo = sysFileInfoMapper.getTypeInfo(deviceName);
//获取日租金
Long leasePrice = (Long) map.get("leasePrice");
//设备型号
String modelName = (String) map.get("modelName");
//出厂日期
String outFacTime = (String) map.get("outFacTime");
DevInfo devInfo1 = new DevInfo();
devInfo1.setCreateTime(DateUtils.getDate());
//获取用户信息
Long userId = SecurityUtils.getUserId();
//保存用户信息
devInfo1.setCreator(userId);
devInfo1.setCode(String.valueOf(UUID.randomUUID()));
devInfo1.setOwnCo(Long.valueOf(bmCompanyInfo.getCompanyId()));
devInfo1.setTypeId(typeInfo.getTypeId());
devInfo1.setJsDayPrice(Float.valueOf(leasePrice));
devInfo1.setModelName(modelName);
devInfo1.setProductionDate(outFacTime);
devInfoMapper.insertDevInfo(devInfo1);
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
}
}

7
zlpt-modules/zlpt-equip/src/main/resources/mapper/SysFileInfoMapper.xml
View File

@ -8,6 +8,13 @@
<select id="selectByMaId" resultType="com.bonus.zlpt.equip.api.domain.SysFileInfo">
select * from sys_file_info where model_id = #{maId}
</select>
<select id="getBmCompanyInfo" resultType="com.bonus.zlpt.company.api.domain.BmCompanyInfo">
select * from bm_company_info where company_name = #{companyName}
</select>
<select id="getTypeInfo" resultType="com.bonus.zlpt.equip.api.domain.TypeInfo">
select * from ma_type_info where type_name = #{deviceName}
</select>
<insert id="insertFileInfo" parameterType="com.bonus.zlpt.equip.api.domain.SysFileInfo">
insert into sys_file_info (
<if test="modelId != null">model_id,</if>