Explorar el Código

联锁基础表新增字段iotedge_group_id;新建两个表:联锁管理系统用户表interlock_user和联锁管理系统中系统权限对应表interlock_system_limit

sl hace 3 meses
padre
commit
d70dc941a1
Se han modificado 13 ficheros con 613 adiciones y 0 borrados
  1. 5 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/base/entity/InterlockBase.java
  2. 177 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/controller/InterlockSystemLimitController.java
  3. 74 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/entity/InterlockSystemLimit.java
  4. 17 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/mapper/InterlockSystemLimitMapper.java
  5. 5 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/mapper/xml/InterlockSystemLimitMapper.xml
  6. 14 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/service/IInterlockSystemLimitService.java
  7. 19 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/service/impl/InterlockSystemLimitServiceImpl.java
  8. 177 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/controller/InterlockUserController.java
  9. 70 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/entity/InterlockUser.java
  10. 17 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/mapper/InterlockUserMapper.java
  11. 5 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/mapper/xml/InterlockUserMapper.xml
  12. 14 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/service/IInterlockUserService.java
  13. 19 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/service/impl/InterlockUserServiceImpl.java

+ 5 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/base/entity/InterlockBase.java

@@ -106,4 +106,9 @@ public class InterlockBase implements Serializable {
     @ApiModelProperty(value = "联锁状态-未投用投用-名称")
     private java.lang.String interlockStatusWtyName;
 
+    /**iotedge中groupid,group对应系统*/
+    @ApiModelProperty(value = "iotedge中groupid,group对应系统")
+    private java.lang.String iotedgeGroupId;
+
+
 }

+ 177 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/controller/InterlockSystemLimitController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.interlockSystemLimit.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.interlockSystemLimit.entity.InterlockSystemLimit;
+import org.jeecg.modules.interlockSystemLimit.service.IInterlockSystemLimitService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 联锁管理系统中系统权限对应表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+@Api(tags="联锁管理系统中系统权限对应表")
+@RestController
+@RequestMapping("/interlockSystemLimit/interlockSystemLimit")
+@Slf4j
+public class InterlockSystemLimitController extends JeecgController<InterlockSystemLimit, IInterlockSystemLimitService> {
+	@Autowired
+	private IInterlockSystemLimitService interlockSystemLimitService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param interlockSystemLimit
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "联锁管理系统中系统权限对应表-分页列表查询")
+	@ApiOperation(value="联锁管理系统中系统权限对应表-分页列表查询", notes="联锁管理系统中系统权限对应表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<InterlockSystemLimit>> queryPageList(InterlockSystemLimit interlockSystemLimit,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<InterlockSystemLimit> queryWrapper = QueryGenerator.initQueryWrapper(interlockSystemLimit, req.getParameterMap());
+		Page<InterlockSystemLimit> page = new Page<InterlockSystemLimit>(pageNo, pageSize);
+		IPage<InterlockSystemLimit> pageList = interlockSystemLimitService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param interlockSystemLimit
+	 * @return
+	 */
+	@AutoLog(value = "联锁管理系统中系统权限对应表-添加")
+	@ApiOperation(value="联锁管理系统中系统权限对应表-添加", notes="联锁管理系统中系统权限对应表-添加")
+	//@RequiresPermissions("org.jeecg.modules:interlock_system_limit:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody InterlockSystemLimit interlockSystemLimit) {
+		interlockSystemLimitService.save(interlockSystemLimit);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param interlockSystemLimit
+	 * @return
+	 */
+	@AutoLog(value = "联锁管理系统中系统权限对应表-编辑")
+	@ApiOperation(value="联锁管理系统中系统权限对应表-编辑", notes="联锁管理系统中系统权限对应表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:interlock_system_limit:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody InterlockSystemLimit interlockSystemLimit) {
+		interlockSystemLimitService.updateById(interlockSystemLimit);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "联锁管理系统中系统权限对应表-通过id删除")
+	@ApiOperation(value="联锁管理系统中系统权限对应表-通过id删除", notes="联锁管理系统中系统权限对应表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_system_limit:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		interlockSystemLimitService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "联锁管理系统中系统权限对应表-批量删除")
+	@ApiOperation(value="联锁管理系统中系统权限对应表-批量删除", notes="联锁管理系统中系统权限对应表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_system_limit:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.interlockSystemLimitService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "联锁管理系统中系统权限对应表-通过id查询")
+	@ApiOperation(value="联锁管理系统中系统权限对应表-通过id查询", notes="联锁管理系统中系统权限对应表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<InterlockSystemLimit> queryById(@RequestParam(name="id",required=true) String id) {
+		InterlockSystemLimit interlockSystemLimit = interlockSystemLimitService.getById(id);
+		if(interlockSystemLimit==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(interlockSystemLimit);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param interlockSystemLimit
+    */
+    //@RequiresPermissions("org.jeecg.modules:interlock_system_limit:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, InterlockSystemLimit interlockSystemLimit) {
+        return super.exportXls(request, interlockSystemLimit, InterlockSystemLimit.class, "联锁管理系统中系统权限对应表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("interlock_system_limit:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, InterlockSystemLimit.class);
+    }
+
+}

+ 74 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/entity/InterlockSystemLimit.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.interlockSystemLimit.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 联锁管理系统中系统权限对应表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+@Data
+@TableName("interlock_system_limit")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="interlock_system_limit对象", description="联锁管理系统中系统权限对应表")
+public class InterlockSystemLimit implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**装置id*/
+	@Excel(name = "装置id", width = 15)
+    @ApiModelProperty(value = "装置id")
+    private java.lang.String interlockApparatusId;
+	/**系统id*/
+	@Excel(name = "系统id", width = 15)
+    @ApiModelProperty(value = "系统id")
+    private java.lang.String interlockSystemId;
+	/**用户id*/
+	@Excel(name = "用户id", width = 15)
+    @ApiModelProperty(value = "用户id")
+    private java.lang.String interlockUserId;
+	/**权限类型(0管理1查看)*/
+	@Excel(name = "权限类型(0管理1查看)", width = 15)
+    @ApiModelProperty(value = "权限类型(0管理1查看)")
+    private java.lang.String limitType;
+}

+ 17 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/mapper/InterlockSystemLimitMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.interlockSystemLimit.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.interlockSystemLimit.entity.InterlockSystemLimit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 联锁管理系统中系统权限对应表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+public interface InterlockSystemLimitMapper extends BaseMapper<InterlockSystemLimit> {
+
+}

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

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.interlockSystemLimit.mapper.InterlockSystemLimitMapper">
+
+</mapper>

+ 14 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/service/IInterlockSystemLimitService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.interlockSystemLimit.service;
+
+import org.jeecg.modules.interlockSystemLimit.entity.InterlockSystemLimit;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 联锁管理系统中系统权限对应表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+public interface IInterlockSystemLimitService extends IService<InterlockSystemLimit> {
+
+}

+ 19 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockSystemLimit/service/impl/InterlockSystemLimitServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.interlockSystemLimit.service.impl;
+
+import org.jeecg.modules.interlockSystemLimit.entity.InterlockSystemLimit;
+import org.jeecg.modules.interlockSystemLimit.mapper.InterlockSystemLimitMapper;
+import org.jeecg.modules.interlockSystemLimit.service.IInterlockSystemLimitService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 联锁管理系统中系统权限对应表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+@Service
+public class InterlockSystemLimitServiceImpl extends ServiceImpl<InterlockSystemLimitMapper, InterlockSystemLimit> implements IInterlockSystemLimitService {
+
+}

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

@@ -0,0 +1,177 @@
+package org.jeecg.modules.interlockUser.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+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.service.IInterlockUserService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 联锁管理系统用户表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+@Api(tags="联锁管理系统用户表")
+@RestController
+@RequestMapping("/interlockUser/interlockUser")
+@Slf4j
+public class InterlockUserController extends JeecgController<InterlockUser, IInterlockUserService> {
+	@Autowired
+	private IInterlockUserService interlockUserService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param interlockUser
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "联锁管理系统用户表-分页列表查询")
+	@ApiOperation(value="联锁管理系统用户表-分页列表查询", notes="联锁管理系统用户表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<InterlockUser>> queryPageList(InterlockUser interlockUser,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<InterlockUser> queryWrapper = QueryGenerator.initQueryWrapper(interlockUser, req.getParameterMap());
+		Page<InterlockUser> page = new Page<InterlockUser>(pageNo, pageSize);
+		IPage<InterlockUser> pageList = interlockUserService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param interlockUser
+	 * @return
+	 */
+	@AutoLog(value = "联锁管理系统用户表-添加")
+	@ApiOperation(value="联锁管理系统用户表-添加", notes="联锁管理系统用户表-添加")
+	//@RequiresPermissions("org.jeecg.modules:interlock_user:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody InterlockUser interlockUser) {
+		interlockUserService.save(interlockUser);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param interlockUser
+	 * @return
+	 */
+	@AutoLog(value = "联锁管理系统用户表-编辑")
+	@ApiOperation(value="联锁管理系统用户表-编辑", notes="联锁管理系统用户表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:interlock_user:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody InterlockUser interlockUser) {
+		interlockUserService.updateById(interlockUser);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "联锁管理系统用户表-通过id删除")
+	@ApiOperation(value="联锁管理系统用户表-通过id删除", notes="联锁管理系统用户表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_user:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		interlockUserService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "联锁管理系统用户表-批量删除")
+	@ApiOperation(value="联锁管理系统用户表-批量删除", notes="联锁管理系统用户表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_user:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.interlockUserService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "联锁管理系统用户表-通过id查询")
+	@ApiOperation(value="联锁管理系统用户表-通过id查询", notes="联锁管理系统用户表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<InterlockUser> queryById(@RequestParam(name="id",required=true) String id) {
+		InterlockUser interlockUser = interlockUserService.getById(id);
+		if(interlockUser==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(interlockUser);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param interlockUser
+    */
+    //@RequiresPermissions("org.jeecg.modules:interlock_user:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, InterlockUser interlockUser) {
+        return super.exportXls(request, interlockUser, InterlockUser.class, "联锁管理系统用户表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("interlock_user:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, InterlockUser.class);
+    }
+
+}

+ 70 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/entity/InterlockUser.java

@@ -0,0 +1,70 @@
+package org.jeecg.modules.interlockUser.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 联锁管理系统用户表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+@Data
+@TableName("interlock_user")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="interlock_user对象", description="联锁管理系统用户表")
+public class InterlockUser implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**登陆账号名*/
+	@Excel(name = "登陆账号名", width = 15)
+    @ApiModelProperty(value = "登陆账号名")
+    private java.lang.String username;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private java.lang.String remark;
+	/**当前用户角色(0系统管理员1其他角色)*/
+	@Excel(name = "当前用户角色(0系统管理员1其他角色)", width = 15)
+    @ApiModelProperty(value = "当前用户角色(0系统管理员1其他角色)")
+    private java.lang.String role;
+}

+ 17 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockUser/mapper/InterlockUserMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.interlockUser.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.interlockUser.entity.InterlockUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 联锁管理系统用户表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+public interface InterlockUserMapper extends BaseMapper<InterlockUser> {
+
+}

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

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.interlockUser.mapper.InterlockUserMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.interlockUser.service;
+
+import org.jeecg.modules.interlockUser.entity.InterlockUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 联锁管理系统用户表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+public interface IInterlockUserService extends IService<InterlockUser> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.interlockUser.service.impl;
+
+import org.jeecg.modules.interlockUser.entity.InterlockUser;
+import org.jeecg.modules.interlockUser.mapper.InterlockUserMapper;
+import org.jeecg.modules.interlockUser.service.IInterlockUserService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 联锁管理系统用户表
+ * @Author: jeecg-boot
+ * @Date:   2024-07-29
+ * @Version: V1.0
+ */
+@Service
+public class InterlockUserServiceImpl extends ServiceImpl<InterlockUserMapper, InterlockUser> implements IInterlockUserService {
+
+}