From 6a2141a7e481f67f35c062e235196ec5d115b164 Mon Sep 17 00:00:00 2001 From: zfhai <15856818120@163.com> Date: Sun, 10 Dec 2023 02:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zlpt/equip/api/RemoteDevInfoService.java | 4 +- zlpt-modules/zlpt-equip/pom.xml | 6 +++ .../equip/controller/DevInfoController.java | 12 +++++ .../zlpt/equip/mapper/SysFileInfoMapper.java | 7 +++ .../zlpt/equip/service/IDevInfoService.java | 2 + .../service/impl/DevInfoServiceImpl.java | 45 +++++++++++++++++++ .../resources/mapper/SysFileInfoMapper.xml | 7 +++ 7 files changed, 81 insertions(+), 2 deletions(-) diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/RemoteDevInfoService.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/RemoteDevInfoService.java index 3c40264..da095f8 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/RemoteDevInfoService.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/RemoteDevInfoService.java @@ -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); } diff --git a/zlpt-modules/zlpt-equip/pom.xml b/zlpt-modules/zlpt-equip/pom.xml index 577a91a..1a6a293 100644 --- a/zlpt-modules/zlpt-equip/pom.xml +++ b/zlpt-modules/zlpt-equip/pom.xml @@ -92,6 +92,12 @@ zlpt-api-equip 3.6.3 + + com.bonus.zlpt + zlpt-api-company + 3.6.3 + compile + 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 2d29453..6737637 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 @@ -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 list = devInfoService.selectDevInfoLists(devInfo); return getDataTable(list); } + + /** + * 添加设备 + * @param devInfo + * @param devInfo + */ + @ApiOperation(value = "查询商品列表") + @PostMapping("/outType") + public void outType(@RequestBody String devInfo){ + devInfoService.insertOutType(devInfo); + } } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/SysFileInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/SysFileInfoMapper.java index 5e04d1f..41728f6 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/SysFileInfoMapper.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/SysFileInfoMapper.java @@ -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 selectByMaId(Long maId); void insertFileInfo(SysFileInfo fileInfo); + + BmCompanyInfo getBmCompanyInfo(@Param("companyName") String companyName); + + TypeInfo getTypeInfo(@Param("deviceName") String deviceName); } 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 4d36b98..d911a66 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 @@ -78,4 +78,6 @@ public interface IDevInfoService public Map sumType(); List selectDevInfoLists(DevInfoVo devInfo); + + void insertOutType(String devInfo); } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java index 2111ec5..bb5dff8 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java @@ -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 map = objectMapper.readValue(devInfo, new TypeReference>() {}); + //获取公司名称 + 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); + } + + } } diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/SysFileInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/SysFileInfoMapper.xml index b2d3e09..4080acc 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/SysFileInfoMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/SysFileInfoMapper.xml @@ -8,6 +8,13 @@ + + insert into sys_file_info ( model_id,