From 97bb270efd83b97a4868bd001a1d8a5fc6584028 Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Mon, 6 Mar 2023 16:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/service/impl/SystemUserServiceImpl.java       | 6 ++++++
 .../xmgl/modules/bigdevice/mapper/xml/LifterAlarmMapper.xml | 3 ++-
 .../xmgl/modules/project/controller/ProjectController.java  | 6 +++++-
 .../service/impl/SecurityCheckPointsServiceImpl.java        | 5 -----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index ea86a7269..67084d61f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -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 {
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterAlarmMapper.xml
index 125a80c0d..ce9acf339 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterAlarmMapper.xml
@@ -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)
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java
index 43b188c92..8ba7bb7e3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java
@@ -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"));
             }
diff --git a/src/main/java/com/zhgd/xmgl/modules/security/service/impl/SecurityCheckPointsServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/security/service/impl/SecurityCheckPointsServiceImpl.java
index a9a09c84d..1fb8935c7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/security/service/impl/SecurityCheckPointsServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/security/service/impl/SecurityCheckPointsServiceImpl.java
@@ -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