From d5fa35e6dd96ed395f4adf1bcd4c9a898841a445 Mon Sep 17 00:00:00 2001 From: mi9688 Date: Tue, 15 Oct 2024 16:46:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E4=BE=8B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=9F=A5=E9=87=8D=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=AB=99=E7=82=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9json=E6=96=87=E4=BB=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E7=AD=89=EF=BC=8C=E5=85=B6=E4=BB=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/BaseEntity.java | 4 +- .../controller/gis/GLegendController.java | 29 ++++- .../controller/gis/GLegendTypeController.java | 90 --------------- .../com/fastbee/oss/domain/OssDetail.java | 2 +- .../com/fastbee/ggroup/domain/GGroups.java | 9 +- .../com/fastbee/ggroup/domain/GLegend.java | 17 +-- .../fastbee/ggroup/domain/GLegendType.java | 46 -------- .../fastbee/ggroup/domain/GSiteGroups.java | 1 - .../com/fastbee/ggroup/domain/GSiteInfo.java | 1 - .../com/fastbee/ggroup/domain/GSites.java | 1 - .../ggroup/domain/vo/GGroupSiteVo.java | 1 + .../ggroup/mapper/GLegendTypeMapper.java | 62 ----------- .../ggroup/service/IGLegendService.java | 6 +- .../ggroup/service/IGLegendTypeService.java | 65 ----------- .../service/impl/GGroupsServiceImpl.java | 57 ++++++---- .../service/impl/GLegendServiceImpl.java | 86 ++++++--------- .../service/impl/GLegendTypeServiceImpl.java | 103 ------------------ .../service/impl/GSiteInfoServiceImpl.java | 2 - .../service/impl/GSitesServiceImpl.java | 46 +++++--- .../resources/mapper/ggroup/GLegendMapper.xml | 22 +++- .../mapper/ggroup/GLegendTypeMapper.xml | 82 -------------- .../com/fastbee/iot/model/DeviceRecordVO.java | 5 +- 22 files changed, 163 insertions(+), 574 deletions(-) delete mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendTypeController.java delete mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegendType.java delete mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GLegendTypeMapper.java delete mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendTypeService.java delete mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendTypeServiceImpl.java delete mode 100644 fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendTypeMapper.xml diff --git a/fastbee-common/src/main/java/com/fastbee/common/core/domain/BaseEntity.java b/fastbee-common/src/main/java/com/fastbee/common/core/domain/BaseEntity.java index a858c52..332d053 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/core/domain/BaseEntity.java +++ b/fastbee-common/src/main/java/com/fastbee/common/core/domain/BaseEntity.java @@ -19,9 +19,7 @@ import lombok.experimental.SuperBuilder; * * @author ruoyi */ -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor + public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java index 3ecbcfe..75297d6 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java @@ -1,10 +1,14 @@ package com.fastbee.data.controller.gis; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.ggroup.domain.dto.GLegendUpdateDto; import com.fastbee.ggroup.domain.dto.GLegendDto; +import com.fastbee.ggroup.enums.SiteTypeCategoryEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -48,7 +52,7 @@ public class GLegendController extends BaseController public TableDataInfo list(GLegend gLegend) { startPage(); - List list = gLegendService.selectGLegendList(gLegend); + List list = gLegendService.selectGLegendList(gLegend); return getDataTable(list); } @@ -60,8 +64,8 @@ public class GLegendController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, GLegend gLegend) { - List list = gLegendService.selectGLegendList(gLegend); - ExcelUtil util = new ExcelUtil(GLegendDto.class); + List list = gLegendService.selectGLegendList(gLegend); + ExcelUtil util = new ExcelUtil(GLegend.class); util.exportExcel(response, list, "图例数据"); } @@ -93,7 +97,7 @@ public class GLegendController extends BaseController @PreAuthorize("@ss.hasPermi('ggroup:legend:edit')") @PutMapping @ApiOperation("修改图例") - public AjaxResult edit(@RequestBody GLegendUpdateDto gLegend) + public AjaxResult edit(@RequestBody GLegend gLegend) { return toAjax(gLegendService.updateGLegend(gLegend)); } @@ -119,7 +123,22 @@ public class GLegendController extends BaseController return success(gLegendService.getLegendListByCategory()); } - + /** + *获取图例的类别列表 + */ + @PreAuthorize("@ss.hasPermi('ggroup:type:category')") + @GetMapping(value = "/category/list") + @ApiOperation("获取图例的类别列表") + public AjaxResult typeList() + { + List> labelList = new ArrayList<>(); + for (SiteTypeCategoryEnum categoryEnum : SiteTypeCategoryEnum.values()) { + Map map = new HashMap<>(); + map.put("name", categoryEnum.getName()); + labelList.add(map); + } + return AjaxResult.success(labelList); + } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendTypeController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendTypeController.java deleted file mode 100644 index 897fbe2..0000000 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendTypeController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.fastbee.data.controller.gis; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; - -import com.fastbee.ggroup.enums.GroupTagEnum; -import com.fastbee.ggroup.enums.SiteTypeCategoryEnum; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.ggroup.domain.GLegendType; -import com.fastbee.ggroup.service.IGLegendTypeService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; - -/** - * 图例类型Controller - * - * @author kerwincui - * @date 2024-10-09 - */ -@RestController -@RequestMapping("/gis/legend/type") -@Api(tags = "图例类型") -public class GLegendTypeController extends BaseController -{ - @Autowired - private IGLegendTypeService gLegendTypeService; - -/** - * 查询图例类型列表 - */ -@PreAuthorize("@ss.hasPermi('ggroup:type:list')") -@GetMapping("/list") -@ApiOperation("查询图例类型列表") - public TableDataInfo list(GLegendType gLegendType) - { - startPage(); - List list = gLegendTypeService.selectGLegendTypeList(gLegendType); - return getDataTable(list); - } - - /** - * 获取图例类型详细信息 - */ - @PreAuthorize("@ss.hasPermi('ggroup:type:info')") - @GetMapping(value = "/{id}") - @ApiOperation("获取图例类型详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(gLegendTypeService.selectGLegendTypeById(id)); - } - /** - *获取图例的类别列表 - */ - @PreAuthorize("@ss.hasPermi('ggroup:type:category')") - @GetMapping(value = "/category/list") - @ApiOperation("获取图例的类别列表") - public AjaxResult typeList() - { - List> labelList = new ArrayList<>(); - for (SiteTypeCategoryEnum categoryEnum : SiteTypeCategoryEnum.values()) { - Map map = new HashMap<>(); - map.put("name", categoryEnum.getName()); - labelList.add(map); - } - return AjaxResult.success(labelList); - } - - - - - -} diff --git a/fastbee-plugs/fastbee-oss/src/main/java/com/fastbee/oss/domain/OssDetail.java b/fastbee-plugs/fastbee-oss/src/main/java/com/fastbee/oss/domain/OssDetail.java index 4694a78..8a525b9 100644 --- a/fastbee-plugs/fastbee-oss/src/main/java/com/fastbee/oss/domain/OssDetail.java +++ b/fastbee-plugs/fastbee-oss/src/main/java/com/fastbee/oss/domain/OssDetail.java @@ -13,7 +13,7 @@ import com.fastbee.common.core.domain.BaseEntity; * @author zhuangpeng.li * @date 2024-04-22 */ -@SuperBuilder +@Builder public class OssDetail extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java index 026ce9e..1a38dee 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java @@ -22,7 +22,6 @@ import java.util.Map; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "GGroups",description = "组 g_groups") @Data -@SuperBuilder @NoArgsConstructor @AllArgsConstructor public class GGroups extends BaseEntity @@ -73,19 +72,19 @@ private static final long serialVersionUID = 1L; /** 显示顺序 */ private Integer orderNum; - /** 祖级列表 */ - private String ancestors; + /** 子组 */ private List children = new ArrayList<>(); - private ListchildrenSite = new ArrayList<>(); - /**节点类型：0组，1站点 */ private Integer nodeType= 0; /**节点类型为1时使用 站点id */ private Long siteId; + /**站点类型 */ + private String siteType; + } \ No newline at end of file diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java index bfc9efa..d52ec84 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java @@ -16,7 +16,6 @@ import lombok.experimental.SuperBuilder; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "GLegend",description = "图例 g_legend") @Data -@SuperBuilder @NoArgsConstructor @AllArgsConstructor public class GLegend extends BaseEntity @@ -31,14 +30,10 @@ public class GLegend extends BaseEntity @ApiModelProperty("图标") private String icon; - /** 类型 */ - @Excel(name = "类型") - @ApiModelProperty("类型") - private Long type; - /** 图标名称 */ - @Excel(name = "图标名称") - @ApiModelProperty("图标名称") + /** 图例名称 */ + @Excel(name = "图例名称") + @ApiModelProperty("图例名称") private String name; /** 项目id */ @@ -46,4 +41,10 @@ public class GLegend extends BaseEntity @ApiModelProperty("项目id") private Long projectId; + /** 类别 */ + private String category; + + /**图例描述 */ + private String description; + } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegendType.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegendType.java deleted file mode 100644 index 4250f03..0000000 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegendType.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.fastbee.ggroup.domain; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.*; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.fastbee.common.annotation.Excel; -import com.fastbee.common.core.domain.BaseEntity; - -/** - * 图例类型对象 g_legend_type - * - * @author kerwincui - * @date 2024-10-09 - */ -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "GLegendType",description = "图例类型 g_legend_type") -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class GLegendType extends BaseEntity - { -private static final long serialVersionUID = 1L; - - /** 主键id */ - private Long id; - - /** 图例类型名称 */ - @Excel(name = "图例类型名称") - @ApiModelProperty("图例类型名称") - private String typeName; - - /** 图例类型描述 */ - @Excel(name = "图例类型描述") - @ApiModelProperty("图例类型描述") - private String description; - - /** 类别 */ - @Excel(name = "类别") - @ApiModelProperty("类别") - private String category; - -} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteGroups.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteGroups.java index 2bf5025..838d5ac 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteGroups.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteGroups.java @@ -20,7 +20,6 @@ import com.fastbee.common.core.domain.BaseEntity; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "GSiteGroups",description = "站点组关系 g_site_groups") @Data -@SuperBuilder @NoArgsConstructor @AllArgsConstructor public class GSiteGroups extends BaseEntity diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteInfo.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteInfo.java index 3d016af..11fdf22 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteInfo.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteInfo.java @@ -19,7 +19,6 @@ import com.fastbee.common.core.domain.BaseEntity; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "GSiteInfo",description = "站点基础信息 g_site_info") @Data -@SuperBuilder @NoArgsConstructor @AllArgsConstructor public class GSiteInfo extends BaseEntity diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java index 5985d19..ad32a73 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java @@ -20,7 +20,6 @@ import java.util.Map; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "GSites",description = "站点 g_sites") @Data -@SuperBuilder @NoArgsConstructor @AllArgsConstructor public class GSites extends BaseEntity diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/vo/GGroupSiteVo.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/vo/GGroupSiteVo.java index 8a470e3..72f624c 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/vo/GGroupSiteVo.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/vo/GGroupSiteVo.java @@ -14,5 +14,6 @@ public class GGroupSiteVo { private String space; // 对应 gs.space private String spaceValue; // 对应 gs.space + // Getter 和 Setter } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GLegendTypeMapper.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GLegendTypeMapper.java deleted file mode 100644 index e11d532..0000000 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GLegendTypeMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.fastbee.ggroup.mapper; - -import java.util.List; -import com.fastbee.ggroup.domain.GLegendType; -import com.github.yulichang.base.MPJBaseMapper; - -/** - * 图例类型Mapper接口 - * - * @author kerwincui - * @date 2024-10-09 - */ -public interface GLegendTypeMapper extends MPJBaseMapper -{ - /** - * 查询图例类型 - * - * @param id 图例类型主键 - * @return 图例类型 - */ - public GLegendType selectGLegendTypeById(Long id); - - /** - * 查询图例类型列表 - * - * @param gLegendType 图例类型 - * @return 图例类型集合 - */ - public List selectGLegendTypeList(GLegendType gLegendType); - - /** - * 新增图例类型 - * - * @param gLegendType 图例类型 - * @return 结果 - */ - public int insertGLegendType(GLegendType gLegendType); - - /** - * 修改图例类型 - * - * @param gLegendType 图例类型 - * @return 结果 - */ - public int updateGLegendType(GLegendType gLegendType); - - /** - * 删除图例类型 - * - * @param id 图例类型主键 - * @return 结果 - */ - public int deleteGLegendTypeById(Long id); - - /** - * 批量删除图例类型 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteGLegendTypeByIds(Long[] ids); -} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendService.java index fd781f1..e46ce67 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendService.java @@ -20,7 +20,7 @@ public interface IGLegendService * @param id 图例主键 * @return 图例 */ - public GLegendDto selectGLegendById(Long id); + public GLegend selectGLegendById(Long id); /** * 查询/搜索图例列表 @@ -28,7 +28,7 @@ public interface IGLegendService * @param gLegend 图例 * @return 图例集合 */ - public List selectGLegendList(GLegend gLegend); + public List selectGLegendList(GLegend gLegend); /** * 新增图例 @@ -44,7 +44,7 @@ public interface IGLegendService * @param gLegend 图例 * @return 结果 */ - public int updateGLegend(GLegendUpdateDto gLegend); + public int updateGLegend(GLegend gLegend); /** * 批量删除图例 diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendTypeService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendTypeService.java deleted file mode 100644 index 4f68fb9..0000000 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendTypeService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.fastbee.ggroup.service; - -import java.util.List; -import java.util.Map; - -import com.fastbee.ggroup.domain.GLegendType; - -/** - * 图例类型Service接口 - * - * @author kerwincui - * @date 2024-10-09 - */ -public interface IGLegendTypeService -{ - /** - * 查询图例类型 - * - * @param id 图例类型主键 - * @return 图例类型 - */ - public GLegendType selectGLegendTypeById(Long id); - - /** - * 查询图例类型列表 - * - * @param gLegendType 图例类型 - * @return 图例类型集合 - */ - public List selectGLegendTypeList(GLegendType gLegendType); - - /** - * 新增图例类型 - * - * @param gLegendType 图例类型 - * @return 结果 - */ - public int insertGLegendType(GLegendType gLegendType); - - /** - * 修改图例类型 - * - * @param gLegendType 图例类型 - * @return 结果 - */ - public int updateGLegendType(GLegendType gLegendType); - - /** - * 批量删除图例类型 - * - * @param ids 需要删除的图例类型主键集合 - * @return 结果 - */ - public int deleteGLegendTypeByIds(Long[] ids); - - /** - * 删除图例类型信息 - * - * @param id 图例类型主键 - * @return 结果 - */ - public int deleteGLegendTypeById(Long id); - - -} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java index 1741c13..1d9e454 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java @@ -2,7 +2,9 @@ package com.fastbee.ggroup.service.impl; import cn.hutool.extra.ssh.JschUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.fastbee.common.exception.ServiceException; import com.fastbee.common.utils.DateUtils; import com.fastbee.ggroup.domain.GGroups; import com.fastbee.ggroup.domain.GSiteGroups; @@ -19,11 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import java.util.*; /** @@ -38,11 +36,6 @@ public class GGroupsServiceImpl implements IGGroupsService @Autowired private GGroupsMapper gGroupsMapper; - @Autowired - private GSitesMapper gSitesMapper; - - @Autowired - private GSiteGroupsMapper gSiteGroupsMapper; /** * 查询组 @@ -116,21 +109,22 @@ public class GGroupsServiceImpl implements IGGroupsService for (GGroups group : groupsList) { //查询组的直接子站点列表 //TODO 优化为查询出所有站点列表，内存中处理 - List gGroupSiteVoList = gGroupsMapper.selectGGroupsSiteList(GGroups.builder() - .parentId(group.getId()) - .build()); + GGroups gGroups = new GGroups(); + gGroups.setParentId(group.getId()); + List gGroupSiteVoList = gGroupsMapper.selectGGroupsSiteList(gGroups); //将子站点列表添加到组对象中 List childrenList= group.getChildren(); gGroupSiteVoList.forEach(site->{ - childrenList.add(GGroups.builder() - .id(site.getId()) - .name(site.getName()) - .icon(site.getIcon()) - .space(site.getSpace()) - .spaceValue(site.getSpaceValue()) - .nodeType(1) - .siteId(site.getId()) - .build()); + GGroups gGroups1 = new GGroups(); + gGroups1.setId(site.getId()); + gGroups1.setName(site.getName()); + gGroups1.setSiteType(site.getType()); + gGroups1.setIcon(site.getIcon()); + gGroups1.setSpace(site.getSpace()); + gGroups1.setSpaceValue(site.getSpaceValue()); + gGroups1.setNodeType(1); + gGroups1.setSiteId(site.getId()); + childrenList.add(gGroups1); }); map.put(group.getId(), group); } @@ -146,7 +140,15 @@ public class GGroupsServiceImpl implements IGGroupsService */ @Override public int insertGGroups(GGroups gGroups) - { //TODO 同一个父节点下组名不能重复 + { //同一个父节点下组名不能重复 + GGroups duplicateName=gGroupsMapper.selectOne(new LambdaQueryWrapper() + .select(GGroups::getId) + .eq(GGroups::getName, gGroups.getName().trim()) + .eq(GGroups::getParentId, gGroups.getParentId()) + ); + if(Objects.nonNull(duplicateName)){ + throw new ServiceException("组名已存在!"); + } gGroups.setCreateTime(DateUtils.getNowDate()); return gGroupsMapper.insertGGroups(gGroups); } @@ -160,6 +162,15 @@ public class GGroupsServiceImpl implements IGGroupsService @Override public int updateGGroups(GGroups gGroups) { + //同一个父节点下组名不能重复 + GGroups duplicateName=gGroupsMapper.selectOne(new LambdaQueryWrapper() + .select(GGroups::getId) + .eq(GGroups::getName, gGroups.getName().trim()) + .eq(GGroups::getParentId, gGroups.getParentId()) + .ne(GGroups::getId, gGroups.getId())); + if(Objects.nonNull(duplicateName)){ + throw new ServiceException("组名已存在!"); + } gGroups.setUpdateTime(DateUtils.getNowDate()); return gGroupsMapper.updateGGroups(gGroups); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java index 08dbdd6..e8ad37a 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java @@ -5,13 +5,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.fastbee.common.exception.ServiceException; import com.fastbee.common.utils.DateUtils; -import com.fastbee.ggroup.domain.GLegendType; -import com.fastbee.ggroup.domain.dto.GLegendUpdateDto; -import com.fastbee.ggroup.domain.dto.GLegendCateGoryDto; -import com.fastbee.ggroup.domain.dto.GLegendDto; -import com.fastbee.ggroup.mapper.GLegendTypeMapper; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +16,6 @@ import org.springframework.stereotype.Service; import com.fastbee.ggroup.mapper.GLegendMapper; import com.fastbee.ggroup.domain.GLegend; import com.fastbee.ggroup.service.IGLegendService; -import org.springframework.transaction.annotation.Transactional; /** * 图例Service业务层处理 @@ -34,8 +30,6 @@ public class GLegendServiceImpl implements IGLegendService @Autowired private GLegendMapper gLegendMapper; - @Autowired - private GLegendTypeMapper gLegendTypeMapper; /** * 查询图例 @@ -44,12 +38,10 @@ public class GLegendServiceImpl implements IGLegendService * @return 图例 */ @Override - public GLegendDto selectGLegendById(Long id) + public GLegend selectGLegendById(Long id) { - return gLegendMapper.selectJoinOne(GLegendDto.class,new MPJLambdaWrapper() - .select(GLegend::getId,GLegend::getIcon,GLegend::getType,GLegend::getName) - .select(GLegendType::getTypeName,GLegendType::getCategory) - .leftJoin(GLegendType.class,GLegendType::getId,GLegend::getType) + return gLegendMapper.selectOne(new LambdaQueryWrapper() + .select(GLegend::getId,GLegend::getIcon,GLegend::getName,GLegend::getCategory) .eq(GLegend::getId,id)); } @@ -59,14 +51,11 @@ public class GLegendServiceImpl implements IGLegendService * @return 图例 */ @Override - public List selectGLegendList(GLegend gLegend) { - return gLegendMapper.selectJoinList(GLegendDto.class, new MPJLambdaWrapper() - .select(GLegend::getId, GLegend::getIcon, GLegend::getType, GLegend::getName) - .select(GLegendType::getTypeName, GLegendType::getCategory) - .leftJoin(GLegendType.class, GLegendType::getId, GLegend::getType) - .like(StringUtils.isNotBlank(gLegend.getSearchValue()), - GLegend::getName, StringUtils.isNotBlank(gLegend.getSearchValue()) ? - gLegend.getSearchValue() : null)); + public List selectGLegendList(GLegend gLegend) { + return new LambdaQueryChainWrapper<>(gLegendMapper) + .select(GLegend::getId,GLegend::getIcon,GLegend::getName,GLegend::getCategory) + .like(StringUtils.isNotBlank(gLegend.getSearchValue()), GLegend::getName, gLegend.getSearchValue()) + .list(); } /** @@ -78,6 +67,12 @@ public class GLegendServiceImpl implements IGLegendService @Override public int insertGLegend(GLegend gLegend) { + //图例名称不能重复 + if(!new LambdaQueryChainWrapper<>(gLegendMapper) + .select(GLegend::getId,GLegend::getName) + .eq(GLegend::getName,gLegend.getName().trim()).list().isEmpty()){ + throw new ServiceException("图例名称已存在!"); + } return gLegendMapper.insertGLegend(gLegend); } @@ -88,21 +83,16 @@ public class GLegendServiceImpl implements IGLegendService * @return 结果 */ @Override - @Transactional(rollbackFor = Exception.class) - public int updateGLegend(GLegendUpdateDto gLegend) + public int updateGLegend(GLegend gLegend) { - return (gLegendTypeMapper.updateGLegendType(GLegendType.builder() - .id( gLegend.getType()) - .category(gLegend.getCategory()) - .updateTime(DateUtils.getNowDate()) - .build())==1&& - gLegendMapper.updateGLegend( GLegend.builder() - .id(gLegend.getId()) - .icon(gLegend.getIcon()) - .name(gLegend.getName()) - .type(gLegend.getType()) - .updateTime(DateUtils.getNowDate()) - .build())==1)?1:0; + //图例名称不能重复 + if(!new LambdaQueryChainWrapper<>(gLegendMapper) + .select(GLegend::getId,GLegend::getName) + .eq(GLegend::getName,gLegend.getName().trim()).ne(GLegend::getId,gLegend.getId()).list().isEmpty()){ + throw new ServiceException("图例名称已存在!"); + } + gLegend.setUpdateTime(DateUtils.getNowDate()); + return gLegendMapper.updateGLegend(gLegend); } /** * 批量删除图例 @@ -134,21 +124,17 @@ public class GLegendServiceImpl implements IGLegendService */ @Override public List> getLegendListByCategory() { - // 按照类别分组，并生成结果列表 - return gLegendMapper.selectJoinList(GLegendCateGoryDto.class, new MPJLambdaWrapper() - .select(GLegend::getIcon, GLegend::getName) - .select(GLegendType::getTypeName, GLegendType::getCategory) - .leftJoin(GLegendType.class, GLegendType::getId, GLegend::getType)).stream() - .collect(Collectors.groupingBy(GLegendCateGoryDto::getCategory)) + return new LambdaQueryChainWrapper<>(gLegendMapper) + .select(GLegend::getId,GLegend::getIcon, GLegend::getName,GLegend::getCategory) + .list().stream() + .collect(Collectors.groupingBy(GLegend::getCategory)) .entrySet().stream() .map(entry -> { - Map itemMap = new HashMap<>(); - itemMap.put("category", entry.getKey()); - itemMap.put("list", entry.getValue()); - return itemMap; - }) - .collect(Collectors.toList()); + Map itemMap = new HashMap<>(); + itemMap.put("category", entry.getKey()); + itemMap.put("list", entry.getValue()); + return itemMap; + } + ).collect((Collectors.toList())); } - - } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendTypeServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendTypeServiceImpl.java deleted file mode 100644 index fe832ae..0000000 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendTypeServiceImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.fastbee.ggroup.service.impl; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import com.fastbee.common.utils.DateUtils; -import com.fastbee.ggroup.enums.SiteTypeCategoryEnum; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.fastbee.ggroup.mapper.GLegendTypeMapper; -import com.fastbee.ggroup.domain.GLegendType; -import com.fastbee.ggroup.service.IGLegendTypeService; - -/** - * 图例类型Service业务层处理 - * - * @author kerwincui - * @date 2024-10-09 - */ -@Service -public class GLegendTypeServiceImpl implements IGLegendTypeService -{ - @Autowired - private GLegendTypeMapper gLegendTypeMapper; - - /** - * 查询图例类型 - * - * @param id 图例类型主键 - * @return 图例类型 - */ - @Override - public GLegendType selectGLegendTypeById(Long id) - { - return gLegendTypeMapper.selectGLegendTypeById(id); - } - - /** - * 查询图例类型列表 - * - * @param gLegendType 图例类型 - * @return 图例类型 - */ - @Override - public List selectGLegendTypeList(GLegendType gLegendType) - { - return gLegendTypeMapper.selectGLegendTypeList(gLegendType); - } - - /** - * 新增图例类型 - * - * @param gLegendType 图例类型 - * @return 结果 - */ - @Override - public int insertGLegendType(GLegendType gLegendType) - { - gLegendType.setCreateTime(DateUtils.getNowDate()); - return gLegendTypeMapper.insertGLegendType(gLegendType); - } - - /** - * 修改图例类型 - * - * @param gLegendType 图例类型 - * @return 结果 - */ - @Override - public int updateGLegendType(GLegendType gLegendType) - { - gLegendType.setUpdateTime(DateUtils.getNowDate()); - return gLegendTypeMapper.updateGLegendType(gLegendType); - } - - /** - * 批量删除图例类型 - * - * @param ids 需要删除的图例类型主键 - * @return 结果 - */ - @Override - public int deleteGLegendTypeByIds(Long[] ids) - { - return gLegendTypeMapper.deleteGLegendTypeByIds(ids); - } - - /** - * 删除图例类型信息 - * - * @param id 图例类型主键 - * @return 结果 - */ - @Override - public int deleteGLegendTypeById(Long id) - { - return gLegendTypeMapper.deleteGLegendTypeById(id); - } - - -} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteInfoServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteInfoServiceImpl.java index a09a518..fe3c539 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteInfoServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteInfoServiceImpl.java @@ -26,8 +26,6 @@ public class GSiteInfoServiceImpl implements IGSiteInfoService @Autowired private GSiteInfoMapper gSiteInfoMapper; - @Autowired - private GSitesMapper gSitesMapper; /** * 查询站点基础信息 diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java index c2038dc..20c10de 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java @@ -1,6 +1,7 @@ package com.fastbee.ggroup.service.impl; import java.io.*; +import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.List; @@ -8,10 +9,12 @@ import java.util.Objects; import java.util.stream.Collectors; +import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONException; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fastbee.common.config.RuoYiConfig; import com.fastbee.common.exception.ServiceException; import com.fastbee.ggroup.domain.GSiteGroups; import com.fastbee.ggroup.domain.dto.GGroupSiteDto; @@ -95,12 +98,13 @@ public class GSitesServiceImpl extends ServiceImpl GSiteGroups.builder().siteId(siteId).build()) + .map(siteId -> { + GSiteGroups gSiteGroups = new GSiteGroups(); + gSiteGroups.setSiteId(siteId); + return gSiteGroups; + }) .collect(Collectors.toList()) .stream() .peek(item -> { diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendMapper.xml index ab0f290..ef25dfd 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendMapper.xml +++ b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendMapper.xml @@ -11,20 +11,24 @@ - + + + - select id, icon, create_time, create_by, update_time, update_by, type, name from g_legend + select id, icon, create_time, create_by, update_time, update_by, name, project_id, category, description from g_legend @@ -41,8 +45,10 @@ create_by, update_time, update_by, - type, name, + project_id, + category, + description, #{icon}, @@ -50,8 +56,10 @@ #{createBy}, #{updateTime}, #{updateBy}, - #{type}, #{name}, + #{projectId}, + #{category}, + #{description}, @@ -63,8 +71,10 @@ create_by = #{createBy}, update_time = #{updateTime}, update_by = #{updateBy}, - type = #{type}, name = #{name}, + project_id = #{projectId}, + category = #{category}, + description = #{description}, where id = #{id} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendTypeMapper.xml b/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendTypeMapper.xml deleted file mode 100644 index abf5ced..0000000 --- a/fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendTypeMapper.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - select id, type_name, description, create_time, create_by, update_time, update_by, category from g_legend_type - - - - - - - - insert into g_legend_type - - type_name, - description, - create_time, - create_by, - update_time, - update_by, - category, - - - #{typeName}, - #{description}, - #{createTime}, - #{createBy}, - #{updateTime}, - #{updateBy}, - #{category}, - - - - - update g_legend_type - - type_name = #{typeName}, - description = #{description}, - create_time = #{createTime}, - create_by = #{createBy}, - update_time = #{updateTime}, - update_by = #{updateBy}, - category = #{category}, - - where id = #{id} - - - - delete from g_legend_type where id = #{id} - - - - delete from g_legend_type where id in - - #{id} - - - \ No newline at end of file diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceRecordVO.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceRecordVO.java index caf8d0f..2d555f3 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceRecordVO.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceRecordVO.java @@ -2,10 +2,7 @@ package com.fastbee.iot.model; import com.fastbee.common.annotation.Excel; import com.fastbee.common.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; /** * 设备记录对象 iot_device_record