sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
闵炳辉 2024-07-12 11:20:17 +08:00
commit d200404777
21 changed files with 77 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
das/src/main/java/com/das/common/constant/ProtocolTypeIds.java Normal file
View File

@ -0,0 +1,23 @@
package com.das.common.constant;
/**
* 协议类型枚举值
*/
public interface ProtocolTypeIds {
/**
* IEC 104 主协议
*/
Integer IEC_104_MASTER = 8;
/**
* IEC 104 从协议
*/
Integer IEC_104_SLAVER = 9;
/**
* MODBUS RTU 串口主协议
*/
Integer MODBUS_RTU_MASTER = 12;
/**
* MODBUS TCP 主协议
*/
Integer MODBUS_TCP_MASTER = 16;
}

2
das/src/main/java/com/das/modules/auth/entity/SysAuthority.java
View File

@ -32,7 +32,7 @@ public class SysAuthority extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 用户ID
* 权限ID
*/
@TableId(value = "id", type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)

2
das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
View File

@ -46,6 +46,8 @@ public class SysMenuServiceImpl implements SysMenuService {
@Override
public void deleteMenu(DeleteDto deleteDto) {
//TODO:删除菜单，需要判断菜单下是否有子菜单，有子菜单不能删除
sysMenuMapper.deleteById(deleteDto.getId());
}

5
das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java
View File

@ -44,10 +44,15 @@ public class SysOrgServiceImpl implements SysOrgService {
@Override
public void deleteOrg(DeleteDto deleteDto) {
//TODO: 如果该机构是根机构，最好是不要删除，系统保留一个根机构
//TODO：机构下是否有子机构，如果有，不能删除
// 根据机构id查询是否有用户
if(sysOrgMapper.queryOrgUserCount(deleteDto.getId()) > 0) {
throw new RuntimeException("该机构下有用户，不能删除");
}
sysOrgMapper.deleteById(deleteDto.getId());
}

4
das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java
View File

@ -196,6 +196,8 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public void deleteUser(DeleteDto deleteDto) {
//TODO: 用户不能删除自己，避免删除后系统无法正常登录
if (deleteDto.getId() ==null) {
throw new ServiceException("参数缺失");
}
@ -208,7 +210,7 @@ public class SysUserServiceImpl implements SysUserService {
QueryWrapper<SysUserRole> accountRoleQueryWrapper = new QueryWrapper<>();
accountRoleQueryWrapper.eq("user_id", deleteDto.getId());
this.sysUserRoleMapper.delete(accountRoleQueryWrapper);
//删除角色
//删除用户
sysUserMapper.deleteById(deleteDto.getId());
}

4
das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
View File

@ -56,10 +56,6 @@ public class EquipmentController {
if(!hasPermission){
return R.fail("没有设备管理权限");
}
if (sysEquipmentDto.getOrgId() == null) {
throw new ServiceException("参数缺失");
}
return R.success(sysEquipmentService.creatSysEquipment(sysEquipmentDto));
}

9
das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
View File

@ -1,12 +1,6 @@
package com.das.modules.equipment.controller;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.read.builder.ExcelReaderSheetBuilder;
import com.alibaba.excel.read.metadata.ReadSheet;
import com.das.common.constant.SysAuthorityIds;
import com.das.common.exceptions.ServiceException;
import com.das.common.result.R;
@ -18,7 +12,6 @@ import com.das.modules.equipment.domain.dto.SysIotModelServiceDto;
import com.das.modules.equipment.domain.vo.SysIotModelFieldVo;
import com.das.modules.equipment.domain.vo.SysIotModelServiceVo;
import com.das.modules.equipment.domain.vo.SysIotModelVo;
import com.das.modules.equipment.listener.ExcelListener;
import com.das.modules.equipment.service.SysIotModelService;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@ -27,8 +20,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
/**

2
das/src/main/java/com/das/modules/equipment/domain/excel/SysEquipmentExcel.java
View File

@ -1,8 +1,6 @@
package com.das.modules.equipment.domain.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;

2
das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java
View File

@ -1,8 +1,6 @@
package com.das.modules.equipment.domain.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

2
das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelServiceExcel.java
View File

@ -1,8 +1,6 @@
package com.das.modules.equipment.domain.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;

2
das/src/main/java/com/das/modules/equipment/domain/vo/EquipmentTypeVo.java
View File

@ -1,7 +1,5 @@
package com.das.modules.equipment.domain.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
import lombok.Data;

3
das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
View File

@ -4,11 +4,8 @@ package com.das.modules.equipment.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.das.modules.equipment.domain.dto.SysEquipmentDto;
import com.das.modules.equipment.domain.dto.SysIotModelDto;
import com.das.modules.equipment.domain.dto.SysIotModelFieldDto;
import com.das.modules.equipment.domain.excel.SysEquipmentExcel;
import com.das.modules.equipment.domain.vo.SysEquipmentVo;
import com.das.modules.equipment.domain.vo.SysIotModelFieldVo;
import com.das.modules.equipment.entity.SysEquipment;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

1
das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
View File

@ -1,7 +1,6 @@
package com.das.modules.equipment.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.das.modules.auth.mapper.BaseMapperPlus;
import com.das.modules.equipment.domain.dto.SysIotModelFieldDto;

1
das/src/main/java/com/das/modules/equipment/mapper/SysIotModelServiceMapper.java
View File

@ -1,7 +1,6 @@
package com.das.modules.equipment.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.das.modules.auth.mapper.BaseMapperPlus;
import com.das.modules.equipment.domain.dto.SysIotModelServiceDto;

7
das/src/main/java/com/das/modules/equipment/service/SysEquipmentService.java
View File

@ -1,15 +1,8 @@
package com.das.modules.equipment.service;
import com.das.common.utils.PageDataInfo;
import com.das.modules.auth.entity.SysOrg;
import com.das.modules.equipment.domain.dto.SysEquipmentDto;
import com.das.modules.equipment.domain.dto.SysIotModelDto;
import com.das.modules.equipment.domain.dto.SysIotModelFieldDto;
import com.das.modules.equipment.domain.dto.SysIotModelServiceDto;
import com.das.modules.equipment.domain.vo.SysEquipmentVo;
import com.das.modules.equipment.domain.vo.SysIotModelFieldVo;
import com.das.modules.equipment.domain.vo.SysIotModelServiceVo;
import com.das.modules.equipment.domain.vo.SysIotModelVo;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;

3
das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
View File

@ -11,11 +11,10 @@ import com.das.common.config.SessionUtil;
import com.das.common.exceptions.ServiceException;
import com.das.common.utils.*;
import com.das.modules.auth.domain.vo.SysUserVo;
import com.das.modules.auth.entity.SysOrg;
import com.das.modules.equipment.domain.excel.SheetInfoBean;
import com.das.modules.equipment.domain.dto.SysIotModelDto;
import com.das.modules.equipment.domain.dto.SysIotModelFieldDto;
import com.das.modules.equipment.domain.dto.SysIotModelServiceDto;
import com.das.modules.equipment.domain.excel.SheetInfoBean;
import com.das.modules.equipment.domain.excel.SysIotModelFieldExcel;
import com.das.modules.equipment.domain.excel.SysIotModelServiceExcel;
import com.das.modules.equipment.domain.vo.SysIotModelFieldVo;

19
das/src/main/java/com/das/modules/node/controller/SysNodeController.java
View File

@ -1,12 +1,14 @@
package com.das.modules.node.controller;
import cn.dev33.satoken.stp.StpUtil;
import com.das.common.constant.ProtocolTypeIds;
import com.das.common.constant.SysAuthorityIds;
import com.das.common.exceptions.ServiceException;
import com.das.common.result.R;
import com.das.common.utils.PageDataInfo;
import com.das.modules.node.domain.dto.SysCommunicationLinkDto;
import com.das.modules.node.domain.dto.SysNodeDto;
import com.das.modules.node.domain.vo.ProtocolTypeVo;
import com.das.modules.node.domain.vo.SysCommunicationLinkVo;
import com.das.modules.node.domain.vo.SysNodeVo;
import com.das.modules.node.service.SysNodeService;
@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
@ -130,5 +133,21 @@ public class SysNodeController {
sysNodeService.deleteSysCommunicationLink(sysCommunicationLinkDto.getId());
return R.success();
}
/**
* 查询所有的通讯协议类型
* @return 所有的通讯协议类型
*/
@PostMapping("/protocol/type")
public R<?> queryProtocolTypeList() {
List<ProtocolTypeVo> typeVoList= new ArrayList<>();
typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.IEC_104_MASTER,"IEC104主"));
typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.IEC_104_SLAVER,"IEC104从"));
typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.MODBUS_RTU_MASTER,"MODBUS RTU主"));
typeVoList.add(new ProtocolTypeVo(ProtocolTypeIds.MODBUS_TCP_MASTER,"MODBUS TCP主"));
return R.success(typeVoList);
}
}

22
das/src/main/java/com/das/modules/node/domain/vo/ProtocolTypeVo.java Normal file
View File

@ -0,0 +1,22 @@
package com.das.modules.node.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
@Data
@AllArgsConstructor
public class ProtocolTypeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 协议类型 ID
*/
public Integer protocolTypeId;
/**
* 协议类型 名称
*/
public String protocolTypeName;
}

1
das/src/main/java/com/das/modules/node/domain/vo/SysCommunicationLinkVo.java
View File

@ -1,6 +1,5 @@
package com.das.modules.node.domain.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

1
das/src/main/java/com/das/modules/node/domain/vo/SysNodeVo.java
View File

@ -1,6 +1,5 @@
package com.das.modules.node.domain.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

2
das/src/main/resources/mapper/SysEquipmentMapper.xml
View File

@ -80,7 +80,7 @@
<select id="queryEquipmentTree" resultMap="SysEquipmentListMap">
select t.* from sys_equipment t order by t.code
select t.* from sys_equipment t where t.parent_equipment_id is null or t.parent_equipment_id = 0 order by t.code
</select>
<select id="queryChildrenEquipById" resultMap="SysEquipmentListMap">