首页装备搜索

This commit is contained in:
mashuai 2024-11-23 12:49:14 +08:00
parent f42484d685
commit 61142f74bd
7 changed files with 376 additions and 36 deletions

View File

@ -0,0 +1,243 @@
package com.bonus.common.biz.domain;
import com.bonus.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* Description:
* @Author 阮世耀
* @Create 2023/12/1 19:40
* @Version 1.0
*/
/**
* 企业信息表
*/
@Data
@ApiModel("企业信息表")
public class BmCompanyInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 企业id
*/
@Excel(name = "企业id")
@ApiModelProperty(value = "企业id", required = true)
private Integer companyId;
/**
* 企业名称
*/
@Excel(name = "企业名称")
@ApiModelProperty(value = "企业名称", required = true)
private String companyName;
/**
* 企业类型(社会企业南网集团企业南网控股企业)
*/
@Excel(name = "企业类型")
@ApiModelProperty(value = "企业类型", required = true)
private String companyType;
/**
* 企业所属广东电网广西电网贵州电网云南电网海南电网储能公司深圳供电局超高压公司
*/
@Excel(name = "企业所属")
@ApiModelProperty(value = "企业所属", required = true)
private String companyLtd;
/**
* 统一社会信用代码
*/
@Excel(name = "统一社会信用代码")
@ApiModelProperty(value = "统一社会信用代码", required = true)
private String creditCode;
@Excel(name = "注册地址")
@ApiModelProperty(value = "注册地址", required = true)
private String registerId;
@Excel(name = "经营地址")
@ApiModelProperty(value = "经营地址", required = true)
private String operateId;
/**
* 注册地址
*/
@Excel(name = "注册地址")
@ApiModelProperty(value = "注册地址", required = true)
private String registerAddress;
/**
* 经营地址
*/
@Excel(name = "经营地址")
@ApiModelProperty(value = "经营地址", required = true)
private String operateAddress;
/**
* 证件类型
*/
@Excel(name = "证件类型")
@ApiModelProperty(value = "证件类型", required = true)
private String certificatetype;
/**
* 法人证件号码
*/
@Excel(name = "法人证件号码")
@ApiModelProperty(value = "法人证件号码", required = true)
private String idNumber;
/**
* 营业执照
*/
@Excel(name = "营业执照")
@ApiModelProperty(value = "营业执照", required = true)
private String businessLicense;
/**
* 法人姓名
*/
@Excel(name = "法人姓名")
@ApiModelProperty(value = "法人姓名", required = true)
private String legalPerson;
/**
* 邀请码
*/
@Excel(name = "邀请码")
@ApiModelProperty(value = "邀请码", required = true)
private String invitationCode;
/**
* 邀请企业名称
*/
@Excel(name = "邀请企业名称")
@ApiModelProperty(value = "邀请企业名称", required = true)
private String invitationCoName;
/**
* 经营范围
*/
@Excel(name = "经营范围")
@ApiModelProperty(value = "经营范围", required = true)
private String businessScope;
/**
* 被授权人姓名
*/
@Excel(name = "被授权人姓名")
@ApiModelProperty(value = "被授权人姓名", required = true)
private String authPerson;
/**
* 被授权人身份证
*/
@Excel(name = "被授权人身份证")
@ApiModelProperty(value = "被授权人身份证", required = true)
private String authIdNumber;
/**
* 被授权人手机号
*/
@Excel(name = "被授权人手机号")
@ApiModelProperty(value = "被授权人手机号", required = true)
private String authPhone;
/**
* 法人授权书
*/
@Excel(name = "法人授权书")
@ApiModelProperty(value = "法人授权书", required = true)
private String authDocument;
/**
* 被授权人身份证头像面
*/
@Excel(name = "被授权人身份证头像面")
@ApiModelProperty(value = "被授权人身份证头像面", required = true)
private String idFaceUrl;
/**
* 被授权人身份证国徽面
*/
@Excel(name = "被授权人身份证国徽面")
@ApiModelProperty(value = "被授权人身份证国徽面", required = true)
private String idNationUrl;
/**
* 被授权人邮箱
*/
@Excel(name = "被授权人邮箱")
@ApiModelProperty(value = "被授权人邮箱", required = true)
private String authEmail;
/**
* 创建时间
*/
@Excel(name = "创建时间")
@ApiModelProperty(value = "创建时间", required = true)
private String createTime;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty(value = "创建人", required = true)
private Integer creator;
/**
* 审核人
*/
@Excel(name = "审核人")
@ApiModelProperty(value = "审核人", required = true)
private Integer auditor;
/**
* 审核时间
*/
@Excel(name = "审核时间")
@ApiModelProperty(value = "审核时间", required = true)
private String auditTime;
/**
* 审核备注
*/
@Excel(name = "审核备注")
@ApiModelProperty(value = "审核备注", required = true)
private String auditRemark;
/**
* 状态0待审核1通过2驳回
*/
@Excel(name = "状态0待审核1通过2驳回")
@ApiModelProperty(value = "状态0待审核1通过2驳回", required = true)
private String status;
@Excel(name = "公司logo")
@ApiModelProperty(value = "公司logo", required = true)
private String logoUrl;
@Excel(name = "修改时间")
@ApiModelProperty(value = "修改时间", required = true)
private String updateTime;
@Excel(name = "法人身份证头像面")
@ApiModelProperty(value = "法人身份证头像面", required = true)
private String legalFaceUrl;
@Excel(name = "法人身份证国徽面")
@ApiModelProperty(value = "法人身份证国徽面", required = true)
private String legalNationUrl;
//用户名
private String userName;
}

View File

@ -1,5 +1,6 @@
package com.bonus.material.device.controller;
import com.bonus.common.biz.domain.BmCompanyInfo;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
@ -30,7 +31,7 @@ public class DevInfoController extends BaseController {
private DevInfoService devInfoService;
/**
* 查询设备信息列表
* 查询设备信息列表(首页装备共享大厅查询列表专用)
*/
// @RequiresPermissions("equip:info:list")
@ApiOperation(value = "装备列表")
@ -41,6 +42,18 @@ public class DevInfoController extends BaseController {
return getDataTable(list);
}
/**
* 获取公司列表(供装备新增及首页所属公司筛选使用)
* @param obj
* @return
*/
@GetMapping("/companyList")
@ApiOperation("获取公司列表")
public AjaxResult companyList(BmCompanyInfo obj) {
List<BmCompanyInfo> list = devInfoService.selectCompanyList(obj);
return success(list);
}
/**
* 查询商品列表--包含附件查询
*/

View File

@ -15,75 +15,123 @@ import lombok.ToString;
public class DevInfoVo extends DevInfo {
private Integer pageNum;
private Integer pageSize;
private long parentId;
/* 装备类别 grandpa */
@ApiModelProperty(value = "装备类别")
private String typeName;
/* 装备组别 parent */
@ApiModelProperty(value = "装备组别")
private String groupName;
/* 装备名称 child */
@ApiModelProperty(value = "装备名称")
private String deviceName;
@ApiModelProperty(value = "收藏id")
private int collectId;
@ApiModelProperty(value = "公司名称")
private String companyName;
@ApiModelProperty(value = "公司经营地址")
private String operateAddress;
@ApiModelProperty(value = "公司logo")
private String companyLogoUrl;
@ApiModelProperty(value = "公司入驻时间")
private String companyCreateTime;
@ApiModelProperty(value = "公司上架数量")
private Long companyUpNum;
/* 联系商家,被授权人手机号 */
@ApiModelProperty(value = "认证人电话")
private String authPhone;
@ApiModelProperty(value = "外观图集")
private String[] pictures;
@ApiModelProperty(value = "关键词")
private String keyWord;
@ApiModelProperty(value = "搜索数量")
private Long searchNum;
@ApiModelProperty(value = "检验pdf")
private String examinationPdf;
@ApiModelProperty(value = "保险pdf")
private String insurancePdf;
/**上下架id*/
@ApiModelProperty(value = "上下架id")
private int upId;
@ApiModelProperty(value = "搜索月租金最下值")
private Integer monthLeasePriceMin;
@ApiModelProperty(value = "搜索月租金最大值")
private Integer monthLeasePriceMax;
@ApiModelProperty(value = "搜索装备年份最小值")
private Integer ageMin;
@ApiModelProperty(value = "搜索装备年份最大值")
private Integer ageMax;
@ApiModelProperty(value = "搜索装备工作小时最小值")
private Integer workingHoursMin;
@ApiModelProperty(value = "搜索装备工作小时最大值")
private Integer workingHoursMax;
@ApiModelProperty(value = "搜索装备月租金排序 ASC or DESC")
private String monthLeasePriceOrderBy; // ASC or DESC
private String monthLeasePriceOrderBy;
@ApiModelProperty(value = "搜索装备更新时间排序 ASC or DESC")
private String updateTimeOrderBy; // ASC or DESC
private String updateTimeOrderBy;
@ApiModelProperty(value = "装备分类级别")
private Integer level; //ma_type_level 级别: 1,2,3
private Integer level;
@ApiModelProperty(value = "装备状态")
private String maStatusStr;
@ApiModelProperty(value = "省份名称")
private String provinceStr;
@ApiModelProperty(value = "市名称")
private String cityStr;
@ApiModelProperty(value = "区名称")
private String areaStr;
@ApiModelProperty(value = "装备类别Id")
@ApiModelProperty(value = "所属公司id")
private String companyId;
/* 装备组别 parent */
@ApiModelProperty(value = "装备组别Id")
private String groupId;
@ApiModelProperty(value = "用户id")
private Long userId;
@ApiModelProperty(value = "装备一级类目Id")
private String firstId;
@ApiModelProperty(value = "装备一级类目名称")
private String firstName;
@ApiModelProperty(value = "装备二级类目Id")
private String secondId;
@ApiModelProperty(value = "装备二级类目名称")
private String secondName;
@ApiModelProperty(value = "装备三级类目Id")
private String thirdId;
@ApiModelProperty(value = "装备三级类目名称")
private String thirdName;
}

View File

@ -1,10 +1,7 @@
package com.bonus.material.device.mapper;
import com.bonus.common.biz.domain.BaseAddress;
import com.bonus.common.biz.domain.SysDic;
import com.bonus.common.biz.domain.SysFile;
import com.bonus.common.biz.domain.UserCollect;
import com.bonus.common.biz.domain.*;
import com.bonus.material.device.domain.DevInfo;
import com.bonus.material.device.domain.dto.InfoMotionDto;
import com.bonus.material.device.domain.vo.DevInfoVo;
@ -99,5 +96,12 @@ public interface DevInfoMapper {
String getBaseAddressById(Integer id);
List<DevInfoVo> selectDevInfoLists(DevInfoVo devInfo);
/**
* 查询企业信息
* @param obj
* @return
*/
List<BmCompanyInfo> selectCompanyList(BmCompanyInfo obj);
}

View File

@ -1,6 +1,7 @@
package com.bonus.material.device.service;
import com.bonus.common.biz.domain.BmCompanyInfo;
import com.bonus.material.device.domain.DevInfo;
import com.bonus.material.device.domain.dto.InfoMotionDto;
import com.bonus.material.device.domain.vo.DevInfoVo;
@ -23,7 +24,7 @@ public interface DevInfoService {
DevInfoVo selectDevInfoByMaId(Long maId);
/**
* 查询设备信息列表
* 查询装备共享大厅列表
*
* @param devInfo 设备信息
* @return 设备信息集合
@ -81,4 +82,10 @@ public interface DevInfoService {
List<DevInfoVo> selectDevInfoLists(DevInfoVo devInfo);
/**
* 查询企业列表
* @param obj
* @return
*/
List<BmCompanyInfo> selectCompanyList(BmCompanyInfo obj);
}

View File

@ -32,9 +32,6 @@ import java.util.stream.Collectors;
*/
@Service
public class DevInfoServiceImpl implements DevInfoService {
private final Integer ASPECT_PICTURE = 20;
private final Integer EXAMINATION_PDF = 28;
private final Integer INSURANCE_PDF = 29;
@Resource
private DevInfoMapper devInfoMapper;
@ -76,17 +73,14 @@ public class DevInfoServiceImpl implements DevInfoService {
}
/**
* 查询设备信息列表
* 查询装备共享大厅列表
*
* @param devInfo 设备信息
* @return 设备信息
*/
@Override
public List<DevInfoVo> selectDevInfoList(DevInfoVo devInfo) {
List<DevInfoVo> list = devInfoMapper.selectDevInfoList(devInfo);
fillInMaStatusStr(list);
fillInCityStr(list);
return list;
return devInfoMapper.selectDevInfoList(devInfo);
}
/**
@ -268,6 +262,16 @@ public class DevInfoServiceImpl implements DevInfoService {
return list;
}
/**
* 查询公司列表
* @param obj
* @return
*/
@Override
public List<BmCompanyInfo> selectCompanyList(BmCompanyInfo obj) {
return devInfoMapper.selectCompanyList(obj);
}
@Override
public void insertOutType(String devInfo) {
ObjectMapper objectMapper = new ObjectMapper();

View File

@ -35,7 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isOperator" column="is_operator" />
<result property="isActive" column="is_active" />
<result property="deviceName" column="device_name" />
<result property="deviceWeight" column="device_weight" />
<result property="groupName" column="group_name" />
<result property="companyName" column="company_name" />
</resultMap>
@ -91,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jsDayPrice != null and jsDayPrice != ''"> and d.js_day_price = #{jsDayPrice}</if>
<if test="description != null and description != ''"> and d.description = #{description}</if>
<if test="gpsCode != null and gpsCode != ''"> and d.gps_code = #{gpsCode}</if>
<if test="ownCo != null "> and d.own_co = #{ownCo}</if>
<if test="companyId != null "> and d.own_co = #{companyId}</if>
<if test="creator != null "> and d.creator = #{creator}</if>
<if test="updateBy != null "> and d.update_by = #{updateBy}</if>
<if test="specification != null "> and d.specification = #{specification}</if>
@ -146,15 +145,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.person as person,
d.person_phone as personPhone,
c.company_name as companyName,
h.search_num as searchNum,
d.create_time as createTime
FROM
ma_dev_info d
LEFT JOIN ma_hot_search h ON d.ma_id = h.ma_id
LEFT JOIN bm_company_info c ON d.own_co = c.company_id
where
d.is_active='1'
and d.ma_status = '2'
<if test="deviceName != null and deviceName != ''">
and d.device_name like concat('%',#{deviceName},'%')
</if>
order by d.create_time desc
</select>
@ -165,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.device_name as deviceName,
d.device_weight as deviceWeight,
d.type_id as typeId,
mt4.type_name as typeName,
d.ma_status as maStatus,
d.brand as brand,
d.model_name as modelName,
@ -176,11 +177,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.person as person,
d.person_phone as personPhone,
c.company_name as companyName,
h.search_num as searchNum
mt3.type_id as thirdId,
mt3.type_name as thirdName,
mt2.type_id as secondId,
mt2.type_name as secondName,
mt1.type_id as firstId,
mt1.type_name as firstName,
GROUP_CONCAT(CONCAT(mt1.type_name, '/', mt2.type_name, '/', mt3.type_name)) AS groupName
FROM
ma_dev_info d
LEFT JOIN ma_hot_search h ON d.ma_id = h.ma_id
LEFT JOIN bm_company_info c ON d.own_co = c.company_id
LEFT JOIN bm_company_info c ON d.own_co = c.company_id
LEFT JOIN ma_type mt4 ON mt4.type_id = d.type_id and mt4.del_flag = '0'
LEFT JOIN ma_type mt3 ON mt3.type_id = mt4.parent_id and mt3.del_flag = '0'
LEFT JOIN ma_type mt2 ON mt2.type_id = mt3.parent_id and mt2.del_flag = '0'
LEFT JOIN ma_type mt1 ON mt1.type_id = mt2.parent_id and mt1.del_flag = '0'
where
d.is_active='1' and d.ma_id = #{maId}
</select>
@ -204,8 +214,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="maId != null and maId != '' ">ma_id,</if>
<if test="code != null and code != '' ">code,</if>
<if test="deviceName != null and deviceName != '' ">device_name,</if>
<if test="deviceWeight != null and deviceWeight != '' ">device_weight,</if>
<if test="typeId != null and typeId != ''">type_id,</if>
<if test="maStatus != null and maStatus != ''">ma_status,</if>
<if test="leaseScope != null and leaseScope != ''">lease_scope,</if>
@ -381,12 +389,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name,u.type as type,t.group_name as type_name,t.p_id as group_id,t.group_id as company_id
from ma_dev_info d
left join (select t.*, p.type_name as parent_name, p.type_id as p_id,mt.type_name as group_name, mt.type_id as group_id
from ma_type t
left join ma_type p on t.parent_id=p.type_id
left join ma_type mt on p.parent_id = mt.type_id
from ma_type_info t
left join ma_type_info p on t.parent_id=p.type_id
left join ma_type_info mt on p.parent_id = mt.type_id
) t on d.type_id = t.type_id
left join bm_company_info c on d.own_co = c.company_id
left join ma_up_off u on d.ma_id = u.ma_id ORDER BY d.create_time desc
</select>
<select id="selectCompanyList" resultType="com.bonus.common.biz.domain.BmCompanyInfo">
select company_id as companyId,
company_name as companyName,
register_address as registerAddress,
operate_address as operateAddress
from bm_company_info
<where>
<if test="companyName != null and companyName != ''">
and company_name like concat('%',#{companyName},'%')
</if>
</where>
</select>
</mapper>