From ab59198455cff2104d1010c4991a983a8c0ff4b7 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Sun, 3 Dec 2023 17:33:39 +0800 Subject: [PATCH] move equip po --- .../zlpt/common/core/domain/MaDevInfo.java | 305 ------------------ .../zlpt/common/core/domain/MaHotSearch.java | 37 --- .../zlpt/common/core/domain/MaTypeInfo.java | 111 ------- .../common/core/domain/equip/TypeInfo.java | 9 + .../core/domain/equip/vo/DevInfoVo.java | 8 + .../common/core/domain/vo/MaDevInfoVo.java | 8 - .../company/controller/MaUpOffController.java | 4 +- .../home/controller/MaDevInfoController.java | 9 +- .../controller/MaHotSearchController.java | 9 +- .../home/controller/MaTypeInfoController.java | 8 +- .../zlpt/home/mapper/MaDevInfoMapper.java | 6 +- .../zlpt/home/mapper/MaHotSearchMapper.java | 6 +- .../zlpt/home/mapper/MaTypeInfoMapper.java | 4 +- .../zlpt/home/service/MaDevInfoService.java | 6 +- .../zlpt/home/service/MaHotSearchService.java | 6 +- .../zlpt/home/service/MaTypeInfoSevice.java | 5 +- .../service/impl/MaDevInfoServiceImpl.java | 7 +- .../service/impl/MaHotSearchServiceImpl.java | 7 +- .../service/impl/MaTypeInfoServiceImpl.java | 27 +- .../main/resources/mapper/MaDevInfoMapper.xml | 4 +- .../resources/mapper/MaHotSearchMapper.xml | 6 +- .../resources/mapper/MaTypeInfoMapper.xml | 10 +- 22 files changed, 72 insertions(+), 530 deletions(-) delete mode 100644 zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaDevInfo.java delete mode 100644 zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaHotSearch.java delete mode 100644 zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaTypeInfo.java create mode 100644 zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java delete mode 100644 zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/vo/MaDevInfoVo.java diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaDevInfo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaDevInfo.java deleted file mode 100644 index 64a5c33..0000000 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaDevInfo.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.bonus.zlpt.common.core.domain; - - -public class MaDevInfo { - /** - * 设备id - */ - private long maId; - /** - * 系统编码 - */ - private String code; - /** - * 类型id - */ - private long typeId; - /** - * 设备状态(自有，待上架，上架，在租，下架)考虑数据字典 - */ - private String maStatus; - /** - * 租赁范围 - */ - private long leaseScope; - /** - * 设备所在地 - */ - private String location; - /** - * 设备品牌 - */ - private String brand; - /** - * 设备型号 - */ - private String modelName; - /** - * 出厂日期 - */ - private String productionDate; - /** - * 工作时长 - */ - private String workingHours; - /** - * 整机序列号 - */ - private String serialNumber; - /** - * 设备月租价 - */ - private String monthLeasePrice; - /** - * 设备天租价 - */ - private String dayLeasePrice; - /** - * 设备主照片 - */ - private String picUrl; - /** - * 机手月租金 - */ - private String jsMonthPrice; - /** - * 机手天租金 - */ - private String jsDayPrice; - /** - * 详细描述 - */ - private String description; - /** - * gps编号 - */ - private String gpsCode; - /** - * 设备所属公司 - */ - private long ownCo; - /** - * 创建时间 - */ - private String createTime; - /** - * 创建人 - */ - private long creator; - /** - * 订金 - */ - private double deposit; - /** - * 是否删除 - */ - private String isActive; - - - public long getMaId() { - return maId; - } - - public void setMaId(long maId) { - this.maId = maId; - } - - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - - public long getTypeId() { - return typeId; - } - - public void setTypeId(long typeId) { - this.typeId = typeId; - } - - - public String getMaStatus() { - return maStatus; - } - - public void setMaStatus(String maStatus) { - this.maStatus = maStatus; - } - - - public long getLeaseScope() { - return leaseScope; - } - - public void setLeaseScope(long leaseScope) { - this.leaseScope = leaseScope; - } - - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - - public String getBrand() { - return brand; - } - - public void setBrand(String brand) { - this.brand = brand; - } - - - public String getModelName() { - return modelName; - } - - public void setModelName(String modelName) { - this.modelName = modelName; - } - - - public String getProductionDate() { - return productionDate; - } - - public void setProductionDate(String productionDate) { - this.productionDate = productionDate; - } - - - public String getWorkingHours() { - return workingHours; - } - - public void setWorkingHours(String workingHours) { - this.workingHours = workingHours; - } - - - public String getSerialNumber() { - return serialNumber; - } - - public void setSerialNumber(String serialNumber) { - this.serialNumber = serialNumber; - } - - - public String getMonthLeasePrice() { - return monthLeasePrice; - } - - public void setMonthLeasePrice(String monthLeasePrice) { - this.monthLeasePrice = monthLeasePrice; - } - - - public String getDayLeasePrice() { - return dayLeasePrice; - } - - public void setDayLeasePrice(String dayLeasePrice) { - this.dayLeasePrice = dayLeasePrice; - } - - - public String getPicUrl() { - return picUrl; - } - - public void setPicUrl(String picUrl) { - this.picUrl = picUrl; - } - - - public String getJsMonthPrice() { - return jsMonthPrice; - } - - public void setJsMonthPrice(String jsMonthPrice) { - this.jsMonthPrice = jsMonthPrice; - } - - - public String getJsDayPrice() { - return jsDayPrice; - } - - public void setJsDayPrice(String jsDayPrice) { - this.jsDayPrice = jsDayPrice; - } - - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - - public String getGpsCode() { - return gpsCode; - } - - public void setGpsCode(String gpsCode) { - this.gpsCode = gpsCode; - } - - - public long getOwnCo() { - return ownCo; - } - - public void setOwnCo(long ownCo) { - this.ownCo = ownCo; - } - - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - - public long getCreator() { - return creator; - } - - public void setCreator(long creator) { - this.creator = creator; - } - - - public double getDeposit() { - return deposit; - } - - public void setDeposit(double deposit) { - this.deposit = deposit; - } - - - public String getIsActive() { - return isActive; - } - - public void setIsActive(String isActive) { - this.isActive = isActive; - } - -} diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaHotSearch.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaHotSearch.java deleted file mode 100644 index 391dbcb..0000000 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaHotSearch.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.bonus.zlpt.common.core.domain; - - -public class MaHotSearch { - - private long id; - private long maId; - private long searchNum; - - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - - public long getMaId() { - return maId; - } - - public void setMaId(long maId) { - this.maId = maId; - } - - - public long getSearchNum() { - return searchNum; - } - - public void setSearchNum(long searchNum) { - this.searchNum = searchNum; - } - -} diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaTypeInfo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaTypeInfo.java deleted file mode 100644 index 36d780b..0000000 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/MaTypeInfo.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.bonus.zlpt.common.core.domain; - - - -import java.util.ArrayList; -import java.util.List; - -public class MaTypeInfo { - - - /** - * 类型id - */ - private long typeId; - /** - * 父级id - */ - private long parentId; - /** - * 类型名称 - */ - private String typeName; - /** - * 层级 - */ - private String level; - /** - * 排序 - */ - private String sort; - /** - * 是否删除 - */ - private String isActive; - - /** 父部门名称 */ - private String parentName; - - /** 子部门 */ - private List children = new ArrayList(); - - - public long getTypeId() { - return typeId; - } - - public void setTypeId(long typeId) { - this.typeId = typeId; - } - - - public long getParentId() { - return parentId; - } - - public void setParentId(long parentId) { - this.parentId = parentId; - } - - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - - - public String getLevel() { - return level; - } - - public void setLevel(String level) { - this.level = level; - } - - - public String getSort() { - return sort; - } - - public void setSort(String sort) { - this.sort = sort; - } - - - public String getIsActive() { - return isActive; - } - - public void setIsActive(String isActive) { - this.isActive = isActive; - } - - public String getParentName() { - return parentName; - } - - public void setParentName(String parentName) { - this.parentName = parentName; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } -} diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/TypeInfo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/TypeInfo.java index b195aa8..1a3e367 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/TypeInfo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/TypeInfo.java @@ -5,6 +5,9 @@ import com.bonus.zlpt.common.core.web.domain.BaseEntity; import lombok.Data; import lombok.ToString; +import java.util.ArrayList; +import java.util.List; + /** * 设备类型对象 ma_type_info * @@ -45,4 +48,10 @@ public class TypeInfo extends BaseEntity @Excel(name = "是否删除") private String isActive; + /** 父部门名称 */ + private String parentName; + + /** 子部门 */ + private List children = new ArrayList(); + } diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java new file mode 100644 index 0000000..bcb7e44 --- /dev/null +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java @@ -0,0 +1,8 @@ +package com.bonus.zlpt.common.core.domain.equip.vo; + +import com.bonus.zlpt.common.core.domain.equip.DevInfo; + +public class DevInfoVo extends DevInfo { + + private long parentId; +} diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/vo/MaDevInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/vo/MaDevInfoVo.java deleted file mode 100644 index 140571c..0000000 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/vo/MaDevInfoVo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bonus.zlpt.common.core.domain.vo; - -import com.bonus.zlpt.common.core.domain.MaDevInfo; - -public class MaDevInfoVo extends MaDevInfo { - - private long parentId; -} diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUpOffController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUpOffController.java index 23453f6..e52b03d 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUpOffController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUpOffController.java @@ -1,5 +1,5 @@ package com.bonus.zlpt.company.controller; -import com.bonus.zlpt.common.core.domain.MaTypeInfo; +import com.bonus.zlpt.common.core.domain.equip.TypeInfo; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; import com.bonus.zlpt.common.core.web.page.TableDataInfo; @@ -98,7 +98,7 @@ public class MaUpOffController extends BaseController { */ @PostMapping("/getEquipmentType") public TableDataInfo getEquipmentType() { - List list = maTypeInfoSevice.getMaTypeInfoList(); + List list = maTypeInfoSevice.getMaTypeInfoList(); return getDataTable(list); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java index e088de5..eb53d58 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaDevInfoController.java @@ -1,11 +1,10 @@ package com.bonus.zlpt.home.controller; -import com.bonus.zlpt.common.core.domain.MaDevInfo; -import com.bonus.zlpt.common.core.domain.vo.MaDevInfoVo; +import com.bonus.zlpt.common.core.domain.equip.DevInfo; +import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.page.TableDataInfo; import com.bonus.zlpt.home.service.MaDevInfoService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -29,8 +28,8 @@ public class MaDevInfoController extends BaseController { * @return */ @PostMapping("/getEquipmentList") - public TableDataInfo getEquipmentList(@Validated @RequestBody MaDevInfo maDevInfo) { - List list = maDevInfoService.getEquipmentList(maDevInfo); + public TableDataInfo getEquipmentList(@Validated @RequestBody DevInfo maDevInfo) { + List list = maDevInfoService.getEquipmentList(maDevInfo); return getDataTable(list); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaHotSearchController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaHotSearchController.java index 0e3fc47..0bbb618 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaHotSearchController.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaHotSearchController.java @@ -1,12 +1,9 @@ package com.bonus.zlpt.home.controller; -import com.bonus.zlpt.common.core.domain.MaDevInfo; -import com.bonus.zlpt.common.core.domain.MaTypeInfo; -import com.bonus.zlpt.common.core.domain.vo.MaDevInfoVo; +import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.page.TableDataInfo; import com.bonus.zlpt.home.service.MaHotSearchService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -31,11 +28,11 @@ public class MaHotSearchController extends BaseController { public TableDataInfo getHotEquipList(@Validated @RequestBody String more) { //获取更多 if (more!=null && more != ""){ - List list = maHotSearchService.getHotEquipList(); + List list = maHotSearchService.getHotEquipList(); return getDataTable(list); } //获取热搜前四的装备 - List list = maHotSearchService.getHotEquipFourList(); + List list = maHotSearchService.getHotEquipFourList(); return getDataTable(list); } } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaTypeInfoController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaTypeInfoController.java index 557fbfd..82dfbd5 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaTypeInfoController.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/MaTypeInfoController.java @@ -1,14 +1,10 @@ package com.bonus.zlpt.home.controller; -import com.bonus.zlpt.common.core.domain.MaDevInfo; -import com.bonus.zlpt.common.core.domain.MaTypeInfo; +import com.bonus.zlpt.common.core.domain.equip.TypeInfo; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.page.TableDataInfo; import com.bonus.zlpt.home.service.MaTypeInfoSevice; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,7 +24,7 @@ public class MaTypeInfoController extends BaseController { */ @PostMapping("/getEquipmentType") public TableDataInfo getEquipmentType() { - List list = maTypeInfoSevice.getMaTypeInfoList(); + List list = maTypeInfoSevice.getMaTypeInfoList(); return getDataTable(list); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java index 364bde1..09aac6e 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaDevInfoMapper.java @@ -1,10 +1,10 @@ package com.bonus.zlpt.home.mapper; -import com.bonus.zlpt.common.core.domain.MaDevInfo; -import com.bonus.zlpt.common.core.domain.vo.MaDevInfoVo; +import com.bonus.zlpt.common.core.domain.equip.DevInfo; +import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import java.util.List; public interface MaDevInfoMapper { - public List getEquipmentList(MaDevInfo maDevInfo); + public List getEquipmentList(DevInfo maDevInfo); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaHotSearchMapper.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaHotSearchMapper.java index 10ece89..342807c 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaHotSearchMapper.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaHotSearchMapper.java @@ -1,11 +1,11 @@ package com.bonus.zlpt.home.mapper; -import com.bonus.zlpt.common.core.domain.vo.MaDevInfoVo; +import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import java.util.List; public interface MaHotSearchMapper { - public List getHotEquipList(); + public List getHotEquipList(); - public List getHotEquipFourList(); + public List getHotEquipFourList(); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaTypeInfoMapper.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaTypeInfoMapper.java index 7f02cdc..1f0588e 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaTypeInfoMapper.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/mapper/MaTypeInfoMapper.java @@ -1,10 +1,10 @@ package com.bonus.zlpt.home.mapper; -import com.bonus.zlpt.common.core.domain.MaTypeInfo; +import com.bonus.zlpt.common.core.domain.equip.TypeInfo; import java.util.List; public interface MaTypeInfoMapper { - public List getMaTypeInfoList() ; + public List getMaTypeInfoList() ; } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java index 961f07f..6b2b097 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaDevInfoService.java @@ -1,10 +1,10 @@ package com.bonus.zlpt.home.service; -import com.bonus.zlpt.common.core.domain.MaDevInfo; -import com.bonus.zlpt.common.core.domain.vo.MaDevInfoVo; +import com.bonus.zlpt.common.core.domain.equip.DevInfo; +import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import java.util.List; public interface MaDevInfoService { - public List getEquipmentList(MaDevInfo maDevInfo); + public List getEquipmentList(DevInfo maDevInfo); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaHotSearchService.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaHotSearchService.java index 0d1440e..a06c627 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaHotSearchService.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaHotSearchService.java @@ -1,11 +1,11 @@ package com.bonus.zlpt.home.service; -import com.bonus.zlpt.common.core.domain.vo.MaDevInfoVo; +import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import java.util.List; public interface MaHotSearchService { - public List getHotEquipList(); + public List getHotEquipList(); - public List getHotEquipFourList(); + public List getHotEquipFourList(); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaTypeInfoSevice.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaTypeInfoSevice.java index 624545c..abaf80a 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaTypeInfoSevice.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/MaTypeInfoSevice.java @@ -1,11 +1,10 @@ package com.bonus.zlpt.home.service; -import com.bonus.zlpt.common.core.domain.MaDevInfo; -import com.bonus.zlpt.common.core.domain.MaTypeInfo; +import com.bonus.zlpt.common.core.domain.equip.TypeInfo; import java.util.List; public interface MaTypeInfoSevice { - public List getMaTypeInfoList(); + public List getMaTypeInfoList(); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java index cea71de..f0c2b04 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaDevInfoServiceImpl.java @@ -1,10 +1,9 @@ package com.bonus.zlpt.home.service.impl; -import com.bonus.zlpt.common.core.domain.MaDevInfo; -import com.bonus.zlpt.common.core.domain.vo.MaDevInfoVo; +import com.bonus.zlpt.common.core.domain.equip.DevInfo; +import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import com.bonus.zlpt.home.mapper.MaDevInfoMapper; import com.bonus.zlpt.home.service.MaDevInfoService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,7 +15,7 @@ public class MaDevInfoServiceImpl implements MaDevInfoService { @Resource private MaDevInfoMapper maDevInfoMapper; @Override - public List getEquipmentList(MaDevInfo maDevInfo) { + public List getEquipmentList(DevInfo maDevInfo) { return maDevInfoMapper.getEquipmentList(maDevInfo); } } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaHotSearchServiceImpl.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaHotSearchServiceImpl.java index 0595168..aa65467 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaHotSearchServiceImpl.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaHotSearchServiceImpl.java @@ -1,9 +1,8 @@ package com.bonus.zlpt.home.service.impl; -import com.bonus.zlpt.common.core.domain.vo.MaDevInfoVo; +import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; import com.bonus.zlpt.home.mapper.MaHotSearchMapper; import com.bonus.zlpt.home.service.MaHotSearchService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -17,12 +16,12 @@ public class MaHotSearchServiceImpl implements MaHotSearchService { @Override - public List getHotEquipList() { + public List getHotEquipList() { return maHotSearchMapper.getHotEquipList(); } @Override - public List getHotEquipFourList() { + public List getHotEquipFourList() { return maHotSearchMapper.getHotEquipFourList(); } } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaTypeInfoServiceImpl.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaTypeInfoServiceImpl.java index e4fbb3b..5925ada 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaTypeInfoServiceImpl.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/service/impl/MaTypeInfoServiceImpl.java @@ -1,11 +1,8 @@ package com.bonus.zlpt.home.service.impl; -import com.bonus.zlpt.common.core.domain.MaDevInfo; -import com.bonus.zlpt.common.core.domain.MaTypeInfo; -import com.bonus.zlpt.home.mapper.MaDevInfoMapper; +import com.bonus.zlpt.common.core.domain.equip.TypeInfo; import com.bonus.zlpt.home.mapper.MaTypeInfoMapper; import com.bonus.zlpt.home.service.MaTypeInfoSevice; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -22,10 +19,10 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice { @Override - public List getMaTypeInfoList() { - List maTypeInfoList = maTypeInfoMapper.getMaTypeInfoList(); + public List getMaTypeInfoList() { + List maTypeInfoList = maTypeInfoMapper.getMaTypeInfoList(); - List menuTree = buildMenuTree(maTypeInfoList); + List menuTree = buildMenuTree(maTypeInfoList); return menuTree; } @@ -35,13 +32,13 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice { * @param * @return */ - private List buildMenuTree(List maTypeInfoList) { + private List buildMenuTree(List maTypeInfoList) { //用于存放根菜单 - List rootMenus = new ArrayList<>(); - Map> menuMap = new HashMap<>(); + List rootMenus = new ArrayList<>(); + Map> menuMap = new HashMap<>(); // 将菜单按照父菜单ID分组,放在menuMap中 - for (MaTypeInfo maTypeInfo : maTypeInfoList) { + for (TypeInfo maTypeInfo : maTypeInfoList) { Long parentId = maTypeInfo.getParentId() != ' ' ? maTypeInfo.getParentId() : 0; if (!menuMap.containsKey(parentId)) { menuMap.put(parentId, new ArrayList<>()); @@ -52,7 +49,7 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice { // 从根菜单开始，构建菜单树 rootMenus.addAll(menuMap.getOrDefault(0, new ArrayList<>())); System.out.println("rootMenus: "+rootMenus); - for (MaTypeInfo maTypeInfo : rootMenus) { + for (TypeInfo maTypeInfo : rootMenus) { buildSubMenuTree(maTypeInfo, menuMap); } @@ -64,12 +61,12 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice { * @param maTypeInfo * @param menuMap */ - private void buildSubMenuTree(MaTypeInfo maTypeInfo, Map> menuMap) { + private void buildSubMenuTree(TypeInfo maTypeInfo, Map> menuMap) { //获取根菜单的子节点列表 - List children = menuMap.getOrDefault(maTypeInfo.getTypeId(), new ArrayList<>()); + List children = menuMap.getOrDefault(maTypeInfo.getTypeId(), new ArrayList<>()); //Collections.sort(children); maTypeInfo.setChildren(children); - for (MaTypeInfo maTypeInfoChildren : children) { + for (TypeInfo maTypeInfoChildren : children) { buildSubMenuTree(maTypeInfoChildren, menuMap); } } diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaDevInfoMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaDevInfoMapper.xml index ae20c3c..4eabadc 100644 --- a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaDevInfoMapper.xml +++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaDevInfoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select d.ma_id, d.code, d.type_id, d.ma_status, d.lease_scope, d.location, d.brand, d.model_name, d.production_date, d.working_hours, d.serial_number, d.month_lease_price, d.day_lease_price, d.pic_url, d.js_month_price, d.js_day_price, d.description, d.gps_code, d.own_co, d.create_time, diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaHotSearchMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaHotSearchMapper.xml index f575fd6..2a4a6dd 100644 --- a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaHotSearchMapper.xml +++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaHotSearchMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select d.ma_id, d.code, d.type_id, d.ma_status, d.lease_scope, d.location, d.brand, d.model_name, d.production_date, d.working_hours, d.serial_number, d.month_lease_price, d.day_lease_price, d.pic_url, d.js_month_price, d.js_day_price, d.description, d.gps_code, d.own_co, d.create_time, @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select d.ma_id, d.code, d.type_id, d.ma_status, d.lease_scope, d.location, d.brand, d.model_name, d.production_date, d.working_hours, d.serial_number, d.month_lease_price, d.day_lease_price, d.pic_url, d.js_month_price, d.js_day_price, d.description, d.gps_code, d.own_co, d.create_time, diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml index d7ec4bc..c603f21 100644 --- a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml +++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,12 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ma_type_info - select type_id, parent_id, type_name, level, sort, is_active from ma_type_info - select pro_id, pro_name, status, type_id, link_man, telphone, dept_id, del_flag, create_by, create_time, update_by, update_time, remark, company_id from bm_project_info @@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into bm_project_info ( pro_name, status, @@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update bm_project_info pro_name = #{proName},