权限功能补充

zd-common/zd-common-log/src/main/java/com/zd/common/log/aspect/LogAspect.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zd.common.security.utils.SaveUtil;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -106,6 +107,7 @@ public class LogAspect {
             // 处理设置注解上的参数
             getControllerMethodDescription(joinPoint, controllerLog, operLog);
             // 保存数据库
+            SaveUtil.setCommonAttr(operLog);
             asyncLogService.saveSysLog(operLog);
         } catch (Exception exp) {
             // 记录本地异常日志

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/OnecStatusListener.java

@@ -51,7 +51,7 @@ public class OnecStatusListener implements ApplicationListener<OnecStatusEvent>
                         return equipmentStatus;
                     }).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(collect)) {
-                subMessageSendManager.sendHardwareUpdate(labHardwareVOS.get(0).getSubjectId(), collect, 2);
+                subMessageSendManager.sendHardwareUpdate(labHardwareVOS.get(0), collect, 2);
             }
 
         }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RelayStatusListener.java

@@ -57,7 +57,7 @@ public class RelayStatusListener implements ApplicationListener<RelayHardwareSta
                         return equipmentStatus;
                     }).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(collect)) {
-                subMessageSendManager.sendHardwareUpdate(labHardwareVOS.get(0).getSubjectId(), collect, 1);
+                subMessageSendManager.sendHardwareUpdate(labHardwareVOS.get(0), collect, 1);
             }
         }
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/VideoStatusListener.java

@@ -54,7 +54,7 @@ public class VideoStatusListener implements ApplicationListener<VideoHardwareSta
                         return equipmentStatus;
                     }).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(collect)) {
-                subMessageSendManager.sendHardwareUpdate(labHardwareVOS.get(0).getSubjectId(), collect, 2);
+                subMessageSendManager.sendHardwareUpdate(labHardwareVOS.get(0), collect, 2);
             }
         }
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/constants/MqttConstants.java

@@ -28,8 +28,6 @@ public class MqttConstants {
     public static final String LAB_WRAN = "lab/wran";
     //测点数据topic
     public static final String LAB_FUNCTION_DATA = "lab/function/data";
-    //一体机 apk版本发生改变 topic
-    public static final String ONE_APP_DATA = "lab/function/data";
     //一体机消息推送 topic
     public static final String LAB_ONEPC_SUB_NEWS = "lab/news";
     //一体机消息推送apk版本升级 topic

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/service/impl/SubMessageSendManager.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.Assert;
 import com.zd.common.core.utils.SpringUtils;
+import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.event.LabMessageEvent;
 import com.zd.laboratory.mqtt.config.MqttConfig;
 import com.zd.laboratory.mqtt.constants.MqttConstants;
@@ -105,18 +106,18 @@ public class SubMessageSendManager {
     /**
      * 发送硬件状态数据，同时发送到实验室
      *
-     * @param subId
+     * @param hardware
      * @param equipmentStatus
      * @param type            协议类型 1 继电器 2 视频监控
      */
-    public void sendHardwareUpdate(Long subId, List<EquipmentStatus> equipmentStatus, int type) {
+    public void sendHardwareUpdate(LabHardware hardware, List<EquipmentStatus> equipmentStatus, int type) {
         MessageBody messageBody = getMessageBody(equipmentStatus);
         //如果实验室ID为null则不发送实验室主题
-        if (subId != null) {
+        if (hardware.getSubjectId() != null) {
             SubHardwareStatus subHardwareStatus = new SubHardwareStatus();
-            subHardwareStatus.setSubId(subId);
+            subHardwareStatus.setSubId(hardware.getSubjectId());
             subHardwareStatus.setEquipmentStatus(equipmentStatus);
-            String topic = MqttConstants.LAB_VIDEO_DATA + subId;
+            String topic = MqttConstants.LAB_VIDEO_DATA + hardware.getSubjectId();
             //发送实验室主题
             commonSend.send(topic, messageBody, SendMode.ONCE);
             //发送以实验室为主体数据

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabViolationSiteServiceImpl.java

@@ -5,6 +5,8 @@ import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.datascope.annotation.DataScope;
 import com.zd.laboratory.domain.LabViolationScoreSite;
 import com.zd.laboratory.mapper.LabViolationScoreSiteMapper;
 import com.zd.laboratory.service.ILabViolationScoreSiteService;
@@ -129,6 +131,7 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
     }
 
     @Override
+    @DataScope(deptAlias = "", permi = PerPrefix.LABORATORY_SITE )
     public List<LabViolationSite> selectLabViolationSite() {
         return labViolationSiteMapper.selectLabViolationSite();
     }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabGradeManageRecordMapper.xml

@@ -126,6 +126,8 @@
             <if test="searchValue != null and searchValue != ''">
                 and t.rule_name like concat('%', #{searchValue}, '%')
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         ORDER BY t.id DESC
     </select>

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserController.java

@@ -84,7 +84,6 @@ public class SysUserController extends BaseController {
     @ApiOperation("查询用户列表")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) {
-//        user.setUserType("00");
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
@@ -97,7 +96,6 @@ public class SysUserController extends BaseController {
     @ApiOperation("查询用户列表")
     @GetMapping("/getNotAuthList")
     public TableDataInfo getNotAuthList(SysUser user) {
-//        user.setUserType("00");
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
@@ -110,11 +108,6 @@ public class SysUserController extends BaseController {
 //    @PreAuthorize(hasPermi = PerPrefix.SYSTEM_USER+ PerFun.LIST)
     @GetMapping("/selectlist")
     public List<SelectUserVO> selectlist(String nickName) {
-//        user.setUserType("00");
-//        startPage();
-//        if(user.getUserId()!=null){
-//
-//        }
         if(StrUtil.isBlank(nickName)) return Collections.EMPTY_LIST;
         SysUser user = new SysUser();
         user.setNickName(nickName);
@@ -145,11 +138,6 @@ public class SysUserController extends BaseController {
 //    @PreAuthorize(hasPermi = PerPrefix.SYSTEM_USER+ PerFun.LIST)
     @GetMapping("/selectTeacherList")
     public List<SelectUserVO> selectTeacherList(String nickName) {
-//        user.setUserType("00");
-//        startPage();
-//        if(user.getUserId()!=null){
-//
-//        }
         if(StrUtil.isBlank(nickName)) return Collections.EMPTY_LIST;
         SysUser user = new SysUser();
         user.setNickName(nickName);
@@ -670,7 +658,6 @@ public class SysUserController extends BaseController {
     @ApiOperation("获取安全负责人用户列表")
     @GetMapping("/getSafeUserList")
     public AjaxResult getSafeUserList(SysUser user) {
-//        user.setUserType("00");
         List<SysUser> list = userService.getSafeUserList(user);
         return AjaxResult.success(list);
     }