添加新增用户以及修改用户接口

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/mapper/xml/InterlockSystemLimitMapper.xml

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.interlockSystemLimit.mapper.InterlockSystemLimitMapper">
 
-</mapper>
+</mapper>

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/controller/InterlockUserController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.interlockUser.entity.InterlockUser;
+import org.jeecg.modules.interlockUser.entity.InterlockUserAdd;
 import org.jeecg.modules.interlockUser.service.IInterlockUserService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -49,7 +50,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class InterlockUserController extends JeecgController<InterlockUser, IInterlockUserService> {
 	@Autowired
 	private IInterlockUserService interlockUserService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +72,7 @@ public class InterlockUserController extends JeecgController<InterlockUser, IInt
 		IPage<InterlockUser> pageList = interlockUserService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +87,7 @@ public class InterlockUserController extends JeecgController<InterlockUser, IInt
 		interlockUserService.save(interlockUser);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +102,7 @@ public class InterlockUserController extends JeecgController<InterlockUser, IInt
 		interlockUserService.updateById(interlockUser);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +117,7 @@ public class InterlockUserController extends JeecgController<InterlockUser, IInt
 		interlockUserService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +132,7 @@ public class InterlockUserController extends JeecgController<InterlockUser, IInt
 		this.interlockUserService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -174,4 +175,33 @@ public class InterlockUserController extends JeecgController<InterlockUser, IInt
         return super.importExcel(request, response, InterlockUser.class);
     }
 
+
+	 /**
+	  *   新增用户
+	  *
+	  * @param interlockUserAdd
+	  * @return
+	  */
+	 @AutoLog(value = "联锁管理系统用户表-新增用户")
+	 @ApiOperation(value="联锁管理系统用户表-新增用户", notes="联锁管理系统用户表-新增用户")
+	 //@RequiresPermissions("org.jeecg.modules:interlock_user:add")
+	 @PostMapping(value = "/addUser")
+	 public Result<String> addUser(HttpServletRequest request, @RequestBody InterlockUserAdd interlockUserAdd) {
+		 return interlockUserService.addUser(request, interlockUserAdd);
+	 }
+
+	 /**
+	  *  编辑用户
+	  *
+	  * @param interlockUser
+	  * @return
+	  */
+	 @AutoLog(value = "联锁管理系统用户表-编辑用户")
+	 @ApiOperation(value="联锁管理系统用户表-编辑用户", notes="联锁管理系统用户表-编辑用户")
+	 //@RequiresPermissions("org.jeecg.modules:interlock_user:edit")
+	 @RequestMapping(value = "/editUser", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> editUser(HttpServletRequest request, @RequestBody InterlockUserAdd interlockUserAdd) {
+		 return interlockUserService.editUser(request, interlockUserAdd);
+	 }
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/entity/InterlockUserAdd.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.interlockUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.interlockSystemLimit.entity.InterlockSystemLimit;
+
+import java.util.List;
+
+/**
+ * ClassName: interlockUserAdd
+ * Package: org.jeecg.modules.interlockUser.entity
+ * Description:新增修改用户前端传送的数据
+ *
+ * @Author sl
+ * @Create 2024/7/29 10:57
+ * @Version 1.0
+ */
+@Data
+public class InterlockUserAdd {
+    /**用户id*/
+    private java.lang.String id;
+    /**登陆账号名*/
+    private java.lang.String username;
+    /**描述*/
+    private java.lang.String remark;
+    /**当前用户角色（0系统管理员1其他角色）*/
+    private java.lang.String role;
+
+    private List<InterlockSystemLimit> systemLimitList;
+
+}

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/mapper/xml/InterlockUserMapper.xml

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.interlockUser.mapper.InterlockUserMapper">
 
-</mapper>
+</mapper>

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/service/IInterlockUserService.java

@@ -1,7 +1,11 @@
 package org.jeecg.modules.interlockUser.service;
 
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.interlockUser.entity.InterlockUser;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.interlockUser.entity.InterlockUserAdd;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * @Description: 联锁管理系统用户表
@@ -11,4 +15,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IInterlockUserService extends IService<InterlockUser> {
 
+    /**
+     *   author: sl
+     *   version: 1.0
+     *   des: 新增用户
+     *   date: 2024/7/29
+     */
+    Result<String> addUser(HttpServletRequest request, InterlockUserAdd interlockUserAdd);
+
+    /**
+     *   author: sl
+     *   version: 1.0
+     *   des: 编辑用户
+     *   date: 2024/7/29
+     */
+    public Result<String> editUser(HttpServletRequest request, InterlockUserAdd interlockUserAdd);
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/service/impl/InterlockUserServiceImpl.java

@@ -1,12 +1,25 @@
 package org.jeecg.modules.interlockUser.service.impl;
 
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.interlockSystemLimit.entity.InterlockSystemLimit;
+import org.jeecg.modules.interlockSystemLimit.service.IInterlockSystemLimitService;
 import org.jeecg.modules.interlockUser.entity.InterlockUser;
+import org.jeecg.modules.interlockUser.entity.InterlockUserAdd;
 import org.jeecg.modules.interlockUser.mapper.InterlockUserMapper;
 import org.jeecg.modules.interlockUser.service.IInterlockUserService;
+import org.jeecg.modules.iotedgeCollectData.entity.IoTEdgeDevices;
+import org.jeecg.modules.iotedgeCollectData.mapper.IotedgeCollectDataMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 联锁管理系统用户表
  * @Author: jeecg-boot
@@ -16,4 +29,86 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class InterlockUserServiceImpl extends ServiceImpl<InterlockUserMapper, InterlockUser> implements IInterlockUserService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private InterlockUserMapper interlockUserMapper;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private IInterlockSystemLimitService interlockSystemLimitService;
+
+    /**
+     *   author: sl
+     *   version: 1.0
+     *   des: 新增用户
+     *   date: 2024/7/29
+     */
+    public Result<String> addUser(HttpServletRequest request, InterlockUserAdd interlockUserAdd) {
+        //创建一个用户类用来存放新增用户的信息；
+        InterlockUser interlockUser = new InterlockUser();
+
+        String wiseUser = "";
+        //获取当前用户名
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                if (cookie.getName().equals("WISEUser")) {
+                    wiseUser = cookie.getValue();
+                }
+            }
+        }
+        //填充用户信息
+        interlockUser.setCreateBy(wiseUser);//因为不用jeecg内置的用户表，所以此处填充一下创建人
+        interlockUser.setUsername(interlockUserAdd.getUsername());//登陆账户名
+        interlockUser.setRemark(interlockUserAdd.getRemark());//描述
+        interlockUser.setRole(interlockUserAdd.getRole());//角色（0管理员1其他角色）
+        //由于权限表中需要用户id，所以先添加用户表信息后在添加系统权限信息
+        save(interlockUser);
+        //创建一个用户权限列表，用来存放系统权限信息 填充权限信息列表
+        List<InterlockSystemLimit> interlockSystemLimitList = new ArrayList<>(interlockUserAdd.getSystemLimitList());
+        for(InterlockSystemLimit interlockSystemLimit:interlockSystemLimitList){
+            interlockSystemLimit.setCreateBy(wiseUser);
+            interlockSystemLimit.setInterlockUserId(interlockUser.getId());
+        }
+        interlockSystemLimitService.saveBatch(interlockSystemLimitList);
+        return Result.OK("用户添加成功！");
+    }
+
+    /**
+     *   author: sl
+     *   version: 1.0
+     *   des: 编辑用户
+     *   date: 2024/7/29
+     */
+    public Result<String> editUser(HttpServletRequest request, InterlockUserAdd interlockUserAdd) {
+        //创建一个用户类用来存放编辑用户的信息；
+        InterlockUser interlockUser = new InterlockUser();
+
+        String wiseUser = "";
+        //获取当前用户名
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                if (cookie.getName().equals("WISEUser")) {
+                    wiseUser = cookie.getValue();
+                }
+            }
+        }
+        //填充用户信息
+        interlockUser.setUpdateBy(wiseUser);//因为不用jeecg内置的用户表，所以此处填充一下更新人
+        interlockUser.setId(interlockUserAdd.getId());
+        interlockUser.setUsername(interlockUserAdd.getUsername());//登陆账户名
+        interlockUser.setRemark(interlockUserAdd.getRemark());//描述
+        interlockUser.setRole(interlockUserAdd.getRole());//角色（0管理员1其他角色）
+        //创建一个用户权限列表，用来存放系统权限信息 填充权限信息列表
+        List<InterlockSystemLimit> interlockSystemLimitList = new ArrayList<>(interlockUserAdd.getSystemLimitList());
+        for(InterlockSystemLimit interlockSystemLimit:interlockSystemLimitList){
+            interlockSystemLimit.setUpdateBy(wiseUser);
+            interlockSystemLimit.setInterlockUserId(interlockUserAdd.getId());
+        }
+        updateById(interlockUser);
+        interlockSystemLimitService.updateBatchById(interlockSystemLimitList);
+        return Result.OK("用户编辑成功!");
+    }
+
 }