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

消除告警信息

Browse Source
This commit is contained in:
houwei 2024-07-02 08:50:09 +08:00
parent 6976ce31cd
commit 0c61b4b6f7
11 changed files with 13 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
das/src/main/java/com/das/modules/auth/controller/LoginController.java
View File

@ -12,7 +12,6 @@ import com.das.modules.auth.domain.dto.RefreshTokenDto;
import com.das.modules.auth.domain.vo.LoginUserDetailsVo;
import com.das.modules.auth.domain.vo.LoginVo;
import com.das.modules.auth.service.LoginService;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.micrometer.common.util.StringUtils;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
@ -45,7 +44,7 @@ public class LoginController {
* @return 退出结果提示信息
*/
@PostMapping("/login")
public R<LoginUserDetailsVo> login(@RequestBody LoginDto loginDto, HttpServletRequest request, HttpServletResponse response) throws JsonProcessingException {
public R<LoginUserDetailsVo> login(@RequestBody LoginDto loginDto, HttpServletRequest request, HttpServletResponse response) {
LoginUserDetailsVo loginInfo = loginService.login(loginDto,request, response);
if (StringUtils.isNotEmpty(loginInfo.getMsg())){
return R.fail(loginInfo.getMsg());

3
das/src/main/java/com/das/modules/auth/domain/dto/SysMenuQueryDto.java
View File

@ -18,9 +18,6 @@ public class SysMenuQueryDto implements Serializable {
@JsonSerialize(using = ToStringSerializer.class)
private Long parentMenuId ;
/** 是否是首次查询菜单 */
// private Boolean recursive;
/**
* 分页大小
*/

3
das/src/main/java/com/das/modules/auth/domain/dto/SysOrgQueryDto.java
View File

@ -19,9 +19,6 @@ public class SysOrgQueryDto implements Serializable {
@JsonSerialize(using = ToStringSerializer.class)
private Long parentOrgId ;
/** 是否是首次查询机构 */
// private Boolean recursive;
/**
* 分页大小
*/

113
das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java
View File

@ -44,117 +44,4 @@ public class SysMenuVo implements Serializable {
private Date updatedTime ;
private List<SysMenuVo> children;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getMenuName() {
return menuName;
}
public void setMenuName(String menuName) {
this.menuName = menuName;
}
public Integer getMenuOrder() {
return menuOrder;
}
public void setMenuOrder(Integer menuOrder) {
this.menuOrder = menuOrder;
}
public String getMenuIcon() {
return menuIcon;
}
public void setMenuIcon(String menuIcon) {
this.menuIcon = menuIcon;
}
public Integer getFunType() {
return funType;
}
public void setFunType(Integer funType) {
this.funType = funType;
}
public String getFunParam() {
return funParam;
}
public void setFunParam(String funParam) {
this.funParam = funParam;
}
public Integer getAuthorityId() {
return authorityId;
}
public void setAuthorityId(Integer authorityId) {
this.authorityId = authorityId;
}
public Long getParentMenuId() {
return parentMenuId;
}
public void setParentMenuId(Long parentMenuId) {
this.parentMenuId = parentMenuId;
}
public Integer getRevision() {
return revision;
}
public void setRevision(Integer revision) {
this.revision = revision;
}
public String getCreatedBy() {
return createdBy;
}
public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}
public Date getCreatedTime() {
return createdTime;
}
public void setCreatedTime(Date createdTime) {
this.createdTime = createdTime;
}
public String getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(String updatedBy) {
this.updatedBy = updatedBy;
}
public Date getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Date updatedTime) {
this.updatedTime = updatedTime;
}
public List<SysMenuVo> getChildren() {
return children;
}
public void setChildren(List<SysMenuVo> children) {
this.children = children;
}
}

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

@ -9,9 +9,9 @@ import com.das.modules.auth.domain.vo.SysUserVo;
public interface SysUserService {
SysUserDto createUser(SysUserDto sysUserDto);
SysUserDto updateUser(SysUserDto sysUserDto);
void updateUser(SysUserDto sysUserDto);
SysUserDto updateUserById(SysUserDto sysUserDto);
void updateUserById(SysUserDto sysUserDto);
void deleteUser(DeleteDto deleteDto);

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

@ -145,7 +145,7 @@ public class LoginServiceImpl implements LoginService {
if (!BCrypt.checkpw(changePasswordDto.getOldPassword(), sysUser.getPassword())) {
throw new ServiceException("原密码不正确");
}
String newPassword ="";
String newPassword;
if (StringUtils.hasText(changePasswordDto.getNewPassword())) {
newPassword = BCrypt.hashpw(changePasswordDto.getNewPassword(), BCrypt.gensalt());
sysUser.setPassword(newPassword);

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

@ -64,9 +64,8 @@ public class SysOrgServiceImpl implements SysOrgService {
if(sysOrgQueryDto.getParentOrgId() == null) {
sysOrgQueryDto.setParentOrgId(0L);
}
List<SysOrg> rootOrgList = sysOrgMapper.queryAllOrgTree(sysOrgQueryDto.getParentOrgId());
return rootOrgList;
return sysOrgMapper.queryAllOrgTree(sysOrgQueryDto.getParentOrgId());
}
}

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

@ -56,7 +56,7 @@ public class SysUserServiceImpl implements SysUserService {
SysUser sysUser = new SysUser();
BeanCopyUtils.copy(sysUserDto,sysUser);
//密码加密
String passwordEncode = "";
String passwordEncode;
if (!StringUtils.hasText(sysUserDto.getPassword())) {
passwordEncode = BCrypt.hashpw("123456789", BCrypt.gensalt());
} else {
@ -126,7 +126,7 @@ public class SysUserServiceImpl implements SysUserService {
}
@Override
public SysUserDto updateUser(SysUserDto sysUserDto) {
public void updateUser(SysUserDto sysUserDto) {
if (sysUserDto.getId() == null) {
throw new ServiceException("参数缺失");
}
@ -172,11 +172,10 @@ public class SysUserServiceImpl implements SysUserService {
sysUserRoleMapper.insert(accountRole);
}
}
return sysUserDto;
}
@Override
public SysUserDto updateUserById(SysUserDto sysUserDto) {
public void updateUserById(SysUserDto sysUserDto) {
SysUser sysUser = new SysUser();
if (sysUserDto.getId() == null) {
throw new ServiceException("参数缺失");
@ -190,7 +189,6 @@ public class SysUserServiceImpl implements SysUserService {
sysUser.setUpdatedBy(oldSysUser.getAccount());
sysUser.setHeadImage(sysUserDto.getHeadImage());
sysUserMapper.updateById(sysUser);
return sysUserDto;
}
@Override

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

@ -21,7 +21,7 @@ public class EquipmentController {
/**
* 查询所有的设备类型
* @return
* @return 所有的设备类型
*/
@PostMapping("/type")
public R<?> queryEquipmentTypeList() {

2
das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
View File

@ -1,13 +1,11 @@
package com.das.modules.equipment.service;
import com.das.modules.auth.domain.dto.SysMenuDto;
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.SysIotModelFieldVo;
import com.das.modules.equipment.domain.vo.SysIotModelServiceVo;
import com.das.modules.equipment.domain.vo.SysIotModelVo;
import com.das.modules.equipment.entity.SysIotModel;
import java.util.List;

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

@ -56,8 +56,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
sysIotModel.setUpdatedTime(new Date());
sysIotModel.setCreatedBy(sysUserVo.getAccount());
sysIotModel.setUpdatedBy(sysUserVo.getAccount());
// sysIotModel.setCreatedBy("sysUserVo.getAccount()");
// sysIotModel.setUpdatedBy("sysUserVo.getAccount()");
sysIotModel.setRevision(1);
sysIotModelMapper.insert(sysIotModel);
SysIotModelVo sysIotModelVo = new SysIotModelVo();
@ -96,7 +95,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
@Override
public List<SysIotModelVo> querySysIotModel(SysIotModelDto sysIotModelDto) {
List<SysIotModelVo> sysIotModelVoList = new ArrayList<>();
List<SysIotModel> sysIotModels = new ArrayList<>();
List<SysIotModel> sysIotModels;
if (sysIotModelDto.getIotModelCode() == null && sysIotModelDto.getIotModelName() == null){
sysIotModels = sysIotModelMapper.selectList(null);
} else {
@ -142,8 +141,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
sysIotModelField.setUpdatedTime(new Date());
sysIotModelField.setCreatedBy(sysUserVo.getAccount());
sysIotModelField.setUpdatedBy(sysUserVo.getAccount());
// sysIotModelField.setCreatedBy("sysUserVo.getAccount()");
// sysIotModelField.setUpdatedBy("sysUserVo.getAccount()");
sysIotModelField.setRevision(1);
sysIotModelFieldMapper.insert(sysIotModelField);
SysIotModelFieldVo sysIotModelFieldVo = new SysIotModelFieldVo();
@ -207,8 +205,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
sysIotModelServices.setUpdatedTime(new Date());
sysIotModelServices.setCreatedBy(sysUserVo.getAccount());
sysIotModelServices.setUpdatedBy(sysUserVo.getAccount());
// sysIotModelServices.setCreatedBy("sysUserVo.getAccount()");
// sysIotModelServices.setUpdatedBy("sysUserVo.getAccount()");
sysIotModelServices.setRevision(1);
sysIotModelServiceMapper.insert(sysIotModelServices);
SysIotModelServiceVo sysIotModelServiceVo = new SysIotModelServiceVo();