新增用户类

business-service/src/main/java/com/ozs/service/entity/BaseDept.java

@@ -0,0 +1,65 @@
+package com.ozs.service.entity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("Base部门表")
+public class BaseDept implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 父部门ID
+     */
+    private Long parentId;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    private String deptName;
+
+    private Integer orderNum;
+
+    /**
+     * 负责人
+     */
+    private String leader;
+
+    private String phone;
+
+    private String email;
+
+    /**
+     * 部门状态:0正常,1停用
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    /**
+     * 父部门名称
+     */
+    private String parentName;
+}

business-service/src/main/java/com/ozs/service/entity/BaseUser.java

@@ -0,0 +1,63 @@
+package com.ozs.service.entity;
+
+
+import com.ozs.common.annotation.Excel;
+import com.ozs.common.annotation.Excels;
+import com.ozs.common.core.domain.entity.SysDept;
+import com.ozs.common.core.domain.entity.SysRole;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("Base用户表")
+public class BaseUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long id;
+
+    /** 用户ID */
+    private String userId;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 用户账号 */
+    private String userName;
+
+    /** 用户昵称 */
+    private String nickName;
+
+    /** 用户邮箱 */
+    private String email;
+
+    /** 手机号码 */
+    private String phoneNum;
+
+    /** 用户性别 */
+    private Integer sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 帐号状态（0正常 1停用） */
+    private Integer status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private Integer delFlag;
+}

business-service/src/main/java/com/ozs/service/mapper/BaseUserMapper.java

@@ -0,0 +1,17 @@
+package com.ozs.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.service.entity.BaseUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Set;
+
+/**
+ * @author Administrator
+ */
+@Mapper
+public interface BaseUserMapper extends BaseMapper<BaseUser> {
+    
+    Set<String> getUserIdList(@Param("userId") String userId);
+}

business-service/src/main/java/com/ozs/service/service/BaseUserService.java

@@ -0,0 +1,15 @@
+package com.ozs.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.service.entity.BaseCameraManagement;
+import com.ozs.service.entity.BaseUser;
+
+import java.util.Set;
+
+/**
+ * @author Administrator
+ */
+public interface BaseUserService extends IService<BaseUser> {
+    
+    Set<String> getUserIdList(String createBy);
+}

business-service/src/main/java/com/ozs/service/service/impl/BaseUserServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ozs.service.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.service.entity.BaseUser;
+import com.ozs.service.mapper.BaseUserMapper;
+import com.ozs.service.service.BaseUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Set;
+
+/**
+ * @author Administrator
+ */
+@Service
+public class BaseUserServiceImpl extends ServiceImpl<BaseUserMapper, BaseUser> implements BaseUserService {
+    @Autowired
+    private BaseUserMapper baseUserMapper;
+
+    @Override
+    public Set<String> getUserIdList(String createBy) {
+       return baseUserMapper.getUserIdList(createBy);
+    }
+}

business-service/src/main/resources/mapper/service/BaseUserMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.service.mapper.BaseUserMapper">
+
+    <select id="getUserIdList" resultType="java.lang.String" parameterType="java.lang.String">
+        select user_id from  sys_user 
+        where user_id = #{userId}  and data_permission=1
+    </select>
+</mapper>

hazard-sdk/pom.xml

@@ -48,11 +48,6 @@
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>1.2.15</version>
         </dependency>
-<!--        &lt;!&ndash; 系统模块&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.ozs</groupId>-->
-<!--            <artifactId>base-system</artifactId>-->
-<!--        </dependency>-->
         <!-- 业务代码-->
         <dependency>
             <groupId>com.ozs</groupId>

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -14,19 +14,18 @@ import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAlarmFrequency;
 import com.ozs.service.entity.SvcAddress;
+import com.ozs.service.mapper.BaseUserMapper;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
+import com.ozs.service.service.BaseUserService;
 import com.ozs.service.service.MsgAlarmFrequencyService;
 import com.ozs.service.service.MsgAlarmService;
 import com.ozs.service.service.SvcAddressService;
-//import com.ozs.system.service.ISysUserService;
 import com.ozs.vo.ReqDeviceVo;
 import com.ozs.vo.ReqMsgAlarmVo;
 import com.ozs.vo.RespGeoHazardMonitorVo;
 import com.ozs.vo.RespMsgAlarmVo;
 import com.ozs.websocket.WebSocketServer;
-import io.lettuce.core.ScriptOutputType;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,11 +38,10 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
+import java.util.Set;
 
 /**
  * 1. 获取身份认证控制层
@@ -57,8 +55,6 @@ public class GeoHazardMonitorTokenController {
     @Resource
     private ApiTokenUtils apiTokenUtils;
     @Resource
-    private AppTokenUtils appTokenUtils;
-    @Resource
     BaseDeviceDynamicManagementService baseDeviceDynamicManagementService;
     @Autowired
     MsgAlarmService msgAlarmService;
@@ -68,10 +64,10 @@ public class GeoHazardMonitorTokenController {
     SvcAddressService svcAddressService;
     @Autowired
     BaseCameraManagementService baseCameraManagementService;
-//    @Autowired
-//    private ISysUserService userService;
     @Autowired
     private WebSocketServer webSocketServer;
+    @Autowired
+    private BaseUserService baseUserService;
 
     /**
      * 获取web访问令牌
@@ -155,6 +151,7 @@ public class GeoHazardMonitorTokenController {
                 wrapper.eq(BaseCameraManagement::getCameraCode, reqMsgAlarmVo.getAlarmCamera());
             }
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
+            Set<String> userList= baseUserService.getUserIdList(baseCameraManagement.getCreateBy());
             log.info("baseCameraManagement:{}", baseCameraManagement);
             if (ObjectUtils.isEmpty(reqMsgAlarmVo.getLineDir())) {
                 reqMsgAlarmVo.setLineDir(baseCameraManagement.getLineDir());
@@ -165,7 +162,6 @@ public class GeoHazardMonitorTokenController {
             }
             MsgAlarm alarm = msgAlarmService.getOne(lw);
             log.info("alarm:{}", alarm);
-//            SysUser sysUser = userService.selectUserById(1L);
             if (ObjectUtils.isEmpty(alarm)) {
                 MsgAlarm msgAlarm = new MsgAlarm();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarm);
@@ -177,8 +173,8 @@ public class GeoHazardMonitorTokenController {
                     buffer.append(";");
                 }
                 msgAlarm.setImageUrl(buffer.toString());
-//                msgAlarm.setCreateBy(sysUser.getUserId());
-//                msgAlarm.setUpdateBy(sysUser.getUserId());
+                msgAlarm.setCreateBy("admin");
+                msgAlarm.setUpdateBy("admin");
                 msgAlarm.setAlarmMile(baseCameraManagement.getInstallMile());
                 msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
                 msgAlarmService.save(msgAlarm);
@@ -196,8 +192,8 @@ public class GeoHazardMonitorTokenController {
                     buffer.append(";");
                 }
                 msgAlarmVice.setImageUrl(buffer.toString());
-//                msgAlarmVice.setCreateBy(sysUser.getUserId());
-//                msgAlarmVice.setUpdateBy(sysUser.getUserId());
+                msgAlarmVice.setCreateBy("admin");
+                msgAlarmVice.setUpdateBy("admin");
                 msgAlarmFrequencyService.save(msgAlarmVice);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
                 respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getAlarmCamera());
@@ -240,12 +236,11 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("message", "信息编码为空！");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            //SysUser sysUser = userService.selectUserById(1L);
             lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
             BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
             baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
-//            baseDynamicManagement.setUpdateBy(sysUser.getUserId());
+            baseDynamicManagement.setUpdateBy("admin");
             log.info("reqDeviceVo:{}", baseDynamicManagement);
             if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
                 jsonObject.put("resultCode", 1);

pom.xml

@@ -14,7 +14,6 @@
     <properties>
         <base.version>1.0-SNAPSHOT</base.version>
         <hazard.version>1.0-SNAPSHOT</hazard.version>
-        <system.version>1.0-SNAPSHOT</system.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -39,14 +38,6 @@
                 <artifactId>base-common</artifactId>
                 <version>${base.version}</version>
             </dependency>
-
-            <!-- 系统模块-->
-            <dependency>
-                <groupId>com.ozs</groupId>
-                <artifactId>base-system</artifactId>
-                <version>${base.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.ozs</groupId>
                 <artifactId>base-framework</artifactId>