增加配置属性
This commit is contained in:
parent
3f5d1f250c
commit
0c4d7efde2
|
|
@ -0,0 +1,21 @@
|
|||
package com.bonus.material.device.domain.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class DevInfoPropertyVo {
|
||||
|
||||
/** 物资ID */
|
||||
@ApiModelProperty(value = "物资ID")
|
||||
private Long maId;
|
||||
|
||||
/** 属性名称 */
|
||||
@ApiModelProperty(value = "属性名称")
|
||||
private String propertyName;
|
||||
|
||||
/** 属性值 */
|
||||
@ApiModelProperty(value = "属性值")
|
||||
private String propertyValue;
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
package com.bonus.material.device.domain.vo;
|
||||
|
||||
import com.bonus.material.device.domain.DevInfo;
|
||||
import com.bonus.material.ma.vo.MaTypeProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
|
@ -151,4 +152,6 @@ public class DevInfoVo extends DevInfo {
|
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private String endTime;
|
||||
|
||||
@ApiModelProperty(value = "自定义属性列表")
|
||||
private List<DevInfoPropertyVo> devInfoProperties;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,10 @@ import com.bonus.material.device.domain.DevInfo;
|
|||
import com.bonus.material.device.domain.MaDevQc;
|
||||
import com.bonus.material.device.domain.SafeBookInfo;
|
||||
import com.bonus.material.device.domain.dto.InfoMotionDto;
|
||||
import com.bonus.material.device.domain.vo.DevInfoPropertyVo;
|
||||
import com.bonus.material.device.domain.vo.DevInfoVo;
|
||||
import com.bonus.material.device.domain.vo.LeaseVo;
|
||||
import com.bonus.material.ma.vo.MaTypeProperty;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Date;
|
||||
|
|
@ -126,6 +128,12 @@ public interface DevInfoMapper {
|
|||
|
||||
List<DevInfoVo> selectDevInfoLists(DevInfoVo devInfo);
|
||||
|
||||
List<DevInfoPropertyVo> selectDevInfoProperties();
|
||||
|
||||
int deleteDevInfoProperties(@Param("maId")Long maId);
|
||||
|
||||
int insertDevInfoProperties(@Param("maId")Long maId, @Param("list") List<DevInfoPropertyVo> list);
|
||||
|
||||
/**
|
||||
* 查询企业信息
|
||||
* @param obj
|
||||
|
|
|
|||
|
|
@ -15,12 +15,14 @@ import com.bonus.material.book.domain.BookCarInfoDto;
|
|||
import com.bonus.material.device.domain.DevInfo;
|
||||
import com.bonus.material.device.domain.dto.DevInfoImpDto;
|
||||
import com.bonus.material.device.domain.dto.InfoMotionDto;
|
||||
import com.bonus.material.device.domain.vo.DevInfoPropertyVo;
|
||||
import com.bonus.material.device.domain.vo.DevInfoVo;
|
||||
import com.bonus.material.device.domain.vo.DevNameVo;
|
||||
import com.bonus.material.device.domain.vo.LeaseVo;
|
||||
import com.bonus.material.device.mapper.BmFileInfoMapper;
|
||||
import com.bonus.material.device.mapper.DevInfoMapper;
|
||||
import com.bonus.material.device.service.DevInfoService;
|
||||
import com.bonus.material.ma.vo.MaTypeProperty;
|
||||
import com.bonus.system.api.model.LoginUser;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
|
|
@ -531,7 +533,13 @@ public class DevInfoServiceImpl implements DevInfoService {
|
|||
@Override
|
||||
public List<DevInfoVo> selectDevInfoLists(DevInfoVo devInfo) {
|
||||
devInfo.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString());
|
||||
return devInfoMapper.selectDevInfoLists(devInfo);
|
||||
List<DevInfoVo> devInfoVos = devInfoMapper.selectDevInfoLists(devInfo);
|
||||
List<DevInfoPropertyVo> devInfoProperties = devInfoMapper.selectDevInfoProperties();
|
||||
Map<Long, List<DevInfoPropertyVo>> map = devInfoProperties.stream().collect(Collectors.groupingBy(DevInfoPropertyVo::getMaId));
|
||||
for (DevInfoVo devInfos : devInfoVos) {
|
||||
devInfos.setDevInfoProperties(map.get(devInfos.getMaId()));
|
||||
}
|
||||
return devInfoVos;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ public class MaTypeProperty {
|
|||
@ApiModelProperty(value = "类型ID")
|
||||
private Long typeId;
|
||||
|
||||
/** 类型ID */
|
||||
/** 属性名称 */
|
||||
@ApiModelProperty(value = "属性名称")
|
||||
private String propertyName;
|
||||
|
||||
|
|
|
|||
|
|
@ -531,6 +531,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
ORDER BY d.create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectDevInfoProperties" resultType="com.bonus.material.device.domain.vo.DevInfoPropertyVo">
|
||||
select ma_id as maId,
|
||||
property_name as propertyName,
|
||||
property_value as propertyValue
|
||||
from ma_dev_info_properties
|
||||
</select>
|
||||
|
||||
<delete id="deleteDevInfoProperties">
|
||||
delete from ma_dev_info_properties where ma_id = #{maId}
|
||||
</delete>
|
||||
|
||||
<insert id="insertDevInfoProperties">
|
||||
insert into
|
||||
ma_dev_info_properties(ma_id, property_name, property_value, create_time)
|
||||
values
|
||||
<foreach collection="list" item="item" index="index" separator=",">
|
||||
(
|
||||
#{maId},
|
||||
#{item.propertyName},
|
||||
#{item.propertyValue},
|
||||
now()
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<select id="selectCompanyList" resultType="com.bonus.common.biz.domain.BmCompanyInfo">
|
||||
SELECT
|
||||
sd.dept_id as companyId,
|
||||
|
|
|
|||
Loading…
Reference in New Issue