admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
Administrator 2023-03-06 16:05:57 +08:00
parent 30a2e5be91
commit 97bb270efd
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.basicdata.service.impl;
import cn.hutool.core.date.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gexin.fastjson.JSON;
import com.zhgd.exception.CustomException;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
@ -107,10 +108,12 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
.eq(SystemUser::getAccount, MapUtils.getString(map, "account"));
SystemUser systemUser = systemUserMapper.selectOne(queryWrapper);
if (systemUser == null || systemUser.getUserId() == null) {
log.info("查询不到systemUser");
//throw new OpenAlertException("账户或密码错误");
throw new OpenAlertException(MessageUtil.get("loginErr"));
} else {
if (!passwordEncoder.matches(password, systemUser.getPassword())) {
log.info("密码不正确，原：{}，现：{}", password, systemUser.getPassword());
throw new OpenAlertException(MessageUtil.get("loginErr"));
}
/*if(!password.equals(systemUser.getPassword())){
@ -130,10 +133,12 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
Integer loginType = MapUtils.getInteger(map, "loginType");
if (loginType == 1) {
if (systemUser.getAccountType() != 2 && systemUser.getAccountType() != 3 && systemUser.getAccountType() != 4 && systemUser.getAccountType() != 7) {
log.info("账号类型不正确，loginType：{}", loginType);
throw new OpenAlertException(MessageUtil.get("loginErr"));
}
} else if (loginType == 2) {
if (systemUser.getAccountType() != 5 && systemUser.getAccountType() != 6) {
log.info("账号类型不正确，loginType：{}", loginType);
throw new OpenAlertException(MessageUtil.get("loginErr"));
}
}
@ -161,6 +166,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
} else {
companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getSn());
}
log.info("companyConfig：{}", JSON.toJSONString(companyConfig));
if (companyConfig.getExpireTime() == null) {
throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
} else {

3
src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterAlarmMapper.xml
View File

@ -75,8 +75,9 @@
</select>
<select id="queryLifterAlarmPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT a.*
SELECT l.dev_name,a.*
from lifter_alarm a
left join lifter l on a.dev_sn=l.dev_sn
where a.project_sn = #{param.projectSn}
<if test="param.pushPersonId != null">
and find_in_set(#{param.pushPersonId}, a.push_person_ids)

6
src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.redis.lock.RedisRepository;
import com.zhgd.xmgl.async.AsyncProject;
import com.zhgd.xmgl.entity.vo.ZwProjectDataVo;
import com.zhgd.xmgl.modules.project.entity.Project;
@ -23,6 +24,7 @@ import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -44,6 +46,8 @@ public class ProjectController {
private IProjectService projectService;
@Autowired
private AsyncProject asyncProject;
@Resource
private RedisRepository redisRepository;
/**
* 分页列表查询
@ -134,7 +138,7 @@ public class ProjectController {
result.error500(MessageUtil.get("notFindErr"));
} else {
boolean ok = projectService.updateById(project);
//TODO 返回false说明什么？
redisRepository.del("projectInfoBySn:" + project.getProjectSn());
if (ok) {
result.successMsg(MessageUtil.get("editSucess"));
}

5
src/main/java/com/zhgd/xmgl/modules/security/service/impl/SecurityCheckPointsServiceImpl.java
View File

@ -35,11 +35,6 @@ public class SecurityCheckPointsServiceImpl extends ServiceImpl<SecurityCheckPoi
throw new OpenAlertException(MessageUtil.get("notFindErr"));
}
securityCheckPointsMapper.deleteById(id);
if(securityCheckPoints.getParentId()!=0){
QueryWrapper<SecurityCheckPoints> queryWrapper=new QueryWrapper<SecurityCheckPoints>();
queryWrapper.lambda().eq(SecurityCheckPoints::getId,securityCheckPoints.getParentId());
securityCheckPointsMapper.delete(queryWrapper);
}
}
@Override