luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增图例接口添加查重逻辑，添加站点接口修改json文件校验逻辑等，其他修改等

Browse Source
This commit is contained in:
mi9688
2024-10-15 16:46:38 +08:00
parent 29a8d107b4
commit d5fa35e6dd
22 changed files with 163 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fastbee-common/src/main/java/com/fastbee/common/core/domain/BaseEntity.java
View File

@ -19,9 +19,7 @@ import lombok.experimental.SuperBuilder;
*
* @author ruoyi
*/
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;

29
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendController.java
View File

@ -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<GLegendDto> list = gLegendService.selectGLegendList(gLegend);
List<GLegend> 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<GLegendDto> list = gLegendService.selectGLegendList(gLegend);
ExcelUtil<GLegendDto> util = new ExcelUtil<GLegendDto>(GLegendDto.class);
List<GLegend> list = gLegendService.selectGLegendList(gLegend);
ExcelUtil<GLegend> util = new ExcelUtil<GLegend>(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<Map<String, Object>> labelList = new ArrayList<>();
for (SiteTypeCategoryEnum categoryEnum : SiteTypeCategoryEnum.values()) {
Map<String, Object> map = new HashMap<>();
map.put("name", categoryEnum.getName());
labelList.add(map);
}
return AjaxResult.success(labelList);
}

90
fastbee-open-api/src/main/java/com/fastbee/data/controller/gis/GLegendTypeController.java
View File

@ -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<GLegendType> 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<Map<String, Object>> labelList = new ArrayList<>();
for (SiteTypeCategoryEnum categoryEnum : SiteTypeCategoryEnum.values()) {
Map<String, Object> map = new HashMap<>();
map.put("name", categoryEnum.getName());
labelList.add(map);
}
return AjaxResult.success(labelList);
}
}

2
fastbee-plugs/fastbee-oss/src/main/java/com/fastbee/oss/domain/OssDetail.java
View File

@ -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;

9
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GGroups.java
View File

@ -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<GGroups> children = new ArrayList<>();
private List<GGroupSiteVo>childrenSite = new ArrayList<>();
/**节点类型：0组，1站点 */
private Integer nodeType= 0;
/**节点类型为1时使用 站点id */
private Long siteId;
/**站点类型 */
private String siteType;
}

17
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegend.java
View File

@ -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;
}

46
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GLegendType.java
View File

@ -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;
}

1
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteGroups.java
View File

@ -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

1
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteInfo.java
View File

@ -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

1
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSites.java
View File

@ -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

1
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/vo/GGroupSiteVo.java
View File

@ -14,5 +14,6 @@ public class GGroupSiteVo {
private String space; // 对应 gs.space
private String spaceValue; // 对应 gs.space
// Getter 和 Setter
}

62
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/mapper/GLegendTypeMapper.java
View File

@ -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<GLegendType>
{
/**
* 查询图例类型
*
* @param id 图例类型主键
* @return 图例类型
*/
public GLegendType selectGLegendTypeById(Long id);
/**
* 查询图例类型列表
*
* @param gLegendType 图例类型
* @return 图例类型集合
*/
public List<GLegendType> 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);
}

6
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendService.java
View File

@ -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<GLegendDto> selectGLegendList(GLegend gLegend);
public List<GLegend> selectGLegendList(GLegend gLegend);
/**
* 新增图例
@ -44,7 +44,7 @@ public interface IGLegendService
* @param gLegend 图例
* @return 结果
*/
public int updateGLegend(GLegendUpdateDto gLegend);
public int updateGLegend(GLegend gLegend);
/**
* 批量删除图例

65
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGLegendTypeService.java
View File

@ -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<GLegendType> 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);
}

57
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GGroupsServiceImpl.java
View File

@ -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<GGroupSiteVo> gGroupSiteVoList = gGroupsMapper.selectGGroupsSiteList(GGroups.builder()
.parentId(group.getId())
.build());
GGroups gGroups = new GGroups();
gGroups.setParentId(group.getId());
List<GGroupSiteVo> gGroupSiteVoList = gGroupsMapper.selectGGroupsSiteList(gGroups);
//将子站点列表添加到组对象中
List<GGroups> 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<GGroups>()
.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<GGroups>()
.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);
}

86
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendServiceImpl.java
View File

@ -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<GLegend>()
.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<GLegend>()
.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<GLegendDto> selectGLegendList(GLegend gLegend) {
return gLegendMapper.selectJoinList(GLegendDto.class, new MPJLambdaWrapper<GLegend>()
.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<GLegend> 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<Map<String, Object>> getLegendListByCategory() {
// 按照类别分组，并生成结果列表
return gLegendMapper.selectJoinList(GLegendCateGoryDto.class, new MPJLambdaWrapper<GLegend>()
.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<String, Object> itemMap = new HashMap<>();
itemMap.put("category", entry.getKey());
itemMap.put("list", entry.getValue());
return itemMap;
})
.collect(Collectors.toList());
Map<String, Object> itemMap = new HashMap<>();
itemMap.put("category", entry.getKey());
itemMap.put("list", entry.getValue());
return itemMap;
}
).collect((Collectors.toList()));
}
}

103
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GLegendTypeServiceImpl.java
View File

@ -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<GLegendType> 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);
}
}

2
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteInfoServiceImpl.java
View File

@ -26,8 +26,6 @@ public class GSiteInfoServiceImpl implements IGSiteInfoService
@Autowired
private GSiteInfoMapper gSiteInfoMapper;
@Autowired
private GSitesMapper gSitesMapper;
/**
* 查询站点基础信息

46
fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSitesServiceImpl.java
View File

@ -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<GSiteGroupsMapper,GSiteGroups
}
//设置坐标值等信息
getReadJsonFileContent(gSites);
//插入站点表
// 插入站点表
int inserted = gSitesMapper.insert(gSites);
gGroupSiteDto.setSiteId(gSites.getId());
//插入关系表
int inserted1 = gSiteGroupsMapper.insertGSiteGroups(gGroupSiteDto);
return inserted == 1 && inserted1 == 1 ? 1 : 0;
// return 1;
}
/**
@ -109,18 +113,30 @@ public class GSitesServiceImpl extends ServiceImpl<GSiteGroupsMapper,GSiteGroups
*/
private void getReadJsonFileContent(GSites gSites) {
String json;
try {
//TODO 路径优化
InputStream i = Files.newInputStream(new File("C:\\home\\soft\\hzwmiot\\uploadPath" + gSites.getSpace().substring(8)).toPath());
json = IOUtils.toString(i, StandardCharsets.UTF_8);
//校验json格式是否正确
if (!isValidJson(json)) {
throw new ServiceException("json格式不正确！");
}
} catch (IOException e) {
throw new RuntimeException(e);
//TODO 路径优化
//发起http请求获取json数据
String space = gSites.getSpace();
if(Objects.isNull(space)){
throw new ServiceException("请上传站点地图json数据！");
}
gSites.setSpaceValue(json);
String jsonData = HttpUtil.get(space);
System.err.println("获取到json:"+jsonData);
//读取文件内容
if (Objects.isNull(jsonData)) {
throw new ServiceException("上传站点地图json数据为空！");
}
//校验json格式是否正确
if (!isValidJson(jsonData)) {
throw new ServiceException("json格式不正确！");
}
int startIndex = space.indexOf("/profile/upload/");
// System.err.println("路径匹配截取开始下标:"+startIndex);
String relativeUrl = space.substring(startIndex);
// System.err.println("相对路径:"+relativeUrl);
gSites.setSpace(relativeUrl);
gSites.setSpaceValue(jsonData);
}
@ -191,7 +207,11 @@ public class GSitesServiceImpl extends ServiceImpl<GSiteGroupsMapper,GSiteGroups
public int relateGroup(GGroupSiteRelateDto gGroupSiteRelateDto) {
return super.saveBatch(gGroupSiteRelateDto.getSiteIds()
.stream()
.map(siteId -> GSiteGroups.builder().siteId(siteId).build())
.map(siteId -> {
GSiteGroups gSiteGroups = new GSiteGroups();
gSiteGroups.setSiteId(siteId);
return gSiteGroups;
})
.collect(Collectors.toList())
.stream()
.peek(item -> {

22
fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendMapper.xml
View File

@ -11,20 +11,24 @@
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="type" column="type" />
<result property="name" column="name" />
<result property="projectId" column="project_id" />
<result property="category" column="category" />
<result property="description" column="description" />
</resultMap>
<sql id="selectGLegendVo">
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
</sql>
<select id="selectGLegendList" parameterType="GLegend" resultMap="GLegendResult">
<include refid="selectGLegendVo"/>
<where>
<if test="icon != null and icon != ''"> and icon = #{icon}</if>
<if test="type != null "> and type = #{type}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="projectId != null "> and project_id = #{projectId}</if>
<if test="category != null and category != ''"> and category = #{category}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
</where>
</select>
@ -41,8 +45,10 @@
<if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="type != null">type,</if>
<if test="name != null">name,</if>
<if test="projectId != null">project_id,</if>
<if test="category != null">category,</if>
<if test="description != null">description,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="icon != null">#{icon},</if>
@ -50,8 +56,10 @@
<if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="type != null">#{type},</if>
<if test="name != null">#{name},</if>
<if test="projectId != null">#{projectId},</if>
<if test="category != null">#{category},</if>
<if test="description != null">#{description},</if>
</trim>
</insert>
@ -63,8 +71,10 @@
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="type != null">type = #{type},</if>
<if test="name != null">name = #{name},</if>
<if test="projectId != null">project_id = #{projectId},</if>
<if test="category != null">category = #{category},</if>
<if test="description != null">description = #{description},</if>
</trim>
where id = #{id}
</update>

82
fastbee-service/fastbee-ggroup-service/src/main/resources/mapper/ggroup/GLegendTypeMapper.xml
View File

@ -1,82 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fastbee.ggroup.mapper.GLegendTypeMapper">
<resultMap type="GLegendType" id="GLegendTypeResult">
<result property="id" column="id" />
<result property="typeName" column="type_name" />
<result property="description" column="description" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="category" column="category" />
</resultMap>
<sql id="selectGLegendTypeVo">
select id, type_name, description, create_time, create_by, update_time, update_by, category from g_legend_type
</sql>
<select id="selectGLegendTypeList" parameterType="GLegendType" resultMap="GLegendTypeResult">
<include refid="selectGLegendTypeVo"/>
<where>
<if test="typeName != null and typeName != ''"> and type_name like concat('%', #{typeName}, '%')</if>
<if test="description != null and description != ''"> and description = #{description}</if>
<if test="category != null and category != ''"> and category = #{category}</if>
</where>
</select>
<select id="selectGLegendTypeById" parameterType="Long" resultMap="GLegendTypeResult">
<include refid="selectGLegendTypeVo"/>
where id = #{id}
</select>
<insert id="insertGLegendType" parameterType="GLegendType" useGeneratedKeys="true" keyProperty="id">
insert into g_legend_type
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="typeName != null and typeName != ''">type_name,</if>
<if test="description != null">description,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="category != null">category,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="typeName != null and typeName != ''">#{typeName},</if>
<if test="description != null">#{description},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="category != null">#{category},</if>
</trim>
</insert>
<update id="updateGLegendType" parameterType="GLegendType">
update g_legend_type
<trim prefix="SET" suffixOverrides=",">
<if test="typeName != null and typeName != ''">type_name = #{typeName},</if>
<if test="description != null">description = #{description},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="category != null">category = #{category},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteGLegendTypeById" parameterType="Long">
delete from g_legend_type where id = #{id}
</delete>
<delete id="deleteGLegendTypeByIds" parameterType="String">
delete from g_legend_type where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

5
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceRecordVO.java
View File

@ -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