部分功能提交

aidex-admin/src/main/resources/application.yml

@@ -36,8 +36,8 @@ server:
 # 日志配置
 logging:
   level:
-    com.aidex: error
-    org.springframework: error
+    com.aidex: info
+    org.springframework: info
 
 # 用户配置
 user:

aidex-admin/target/classes/application.yml

@@ -36,8 +36,8 @@ server:
 # 日志配置
 logging:
   level:
-    com.aidex: error
-    org.springframework: error
+    com.aidex: info
+    org.springframework: info
 
 # 用户配置
 user:

aidex-common/src/main/java/com/aidex/common/constant/Constants.java

@@ -184,4 +184,14 @@ public class Constants {
      * 注册
      */
     public static final String ATTACH_SAVE_TYPE_DISK = "Disk";
+
+    /**
+     * GPS_token 存储前缀
+     */
+    public static final String GPS_TOKEN_PREFIX = "gps_token:";
+
+    /**
+     * GPS_token 有效期（分钟）
+     */
+    public static final Integer GPS_TOKEN_EXPIRATION = 5;
 }

aidex-common/src/main/java/com/aidex/common/core/domain/BaseEntity.java

@@ -95,6 +95,15 @@ public class BaseEntity<T> implements Serializable {
     }
 
     /**
+     * 是否是新记录（默认：false），调用setIsNewRecord()设置新记录，使用自定义ID。
+     * 设置为true后强制执行插入语句，ID不会自动生成，需从手动传入。
+     * @return
+     */
+    public void setIsNewRecord() {
+        this.isNewRecord = true;
+    }
+
+    /**
      * 当前实体分页对象
      */
     @JsonIgnore

aidex-common/src/main/java/com/aidex/common/enums/AlarmType.java

@@ -0,0 +1,38 @@
+package com.aidex.common.enums;
+
+/**
+ * Gps报警类型
+ *
+ * @author ruoyi
+ */
+public enum AlarmType
+{
+    RESERVED(0, "保留"),
+    SOS(1, "SOS求救"),
+    ANTI_THEFT(2, "防盗报警"),
+    EXIT_FENCE(3, "出围栏报警"),
+    ENTER_FENCE(4, "入围栏报警"),
+    OUT_AGE(5, "断电报警"),
+    OVER_SPEED(6, "超速报警"),
+    LOW_SPEED(7, "低速报警"),
+    LOW_ENERGY(8, "低电报警");
+
+    private final int code;
+    private final String info;
+
+    AlarmType(int code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public int getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

aidex-controller/src/main/java/com/aidex/web/controller/monitor/SysLoginLogController.java

@@ -2,7 +2,6 @@ package com.aidex.web.controller.monitor;
 
 import com.aidex.common.annotation.Log;
 import com.aidex.common.core.controller.BaseController;
-import com.aidex.common.core.domain.AjaxResult;
 import com.aidex.common.core.domain.R;
 import com.aidex.common.core.page.PageDomain;
 import com.aidex.common.enums.BusinessType;
@@ -21,7 +20,7 @@ import java.util.List;
 
 /**
  * 系统访问记录
- * 
+ *
  * @author ruoyi
  */
 @RestController

aidex-controller/src/main/java/com/aidex/web/controller/monitor/SysOperlogController.java

@@ -19,7 +19,7 @@ import java.util.List;
 
 /**
  * 操作日志记录
- * 
+ *
  * @author ruoyi
  */
 @RestController

aidex-controller/src/main/java/com/aidex/web/controller/monitor/SysUserOnlineController.java

@@ -2,7 +2,6 @@ package com.aidex.web.controller.monitor;
 
 import com.aidex.common.annotation.Log;
 import com.aidex.common.constant.CacheConstants;
-import com.aidex.common.constant.Constants;
 import com.aidex.common.core.controller.BaseController;
 import com.aidex.common.core.domain.AjaxResult;
 import com.aidex.common.core.domain.model.LoginUser;
@@ -23,7 +22,7 @@ import java.util.List;
 
 /**
  * 在线用户监控
- * 
+ *
  * @author ruoyi
  */
 @RestController

aidex-controller/src/main/java/com/aidex/web/controller/system/SysAlarmController.java

@@ -0,0 +1,108 @@
+package com.aidex.web.controller.system;
+
+import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
+import com.aidex.common.annotation.Log;
+import com.aidex.common.core.domain.R;
+import com.github.pagehelper.PageInfo;
+import com.aidex.common.core.page.PageDomain;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.aidex.common.enums.BusinessType;
+import com.aidex.common.utils.poi.ExcelUtil;
+import com.aidex.framework.cache.DictUtils;
+import org.springframework.web.bind.annotation.*;
+import com.aidex.common.core.controller.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.aidex.system.domain.SysAlarm;
+import com.aidex.system.service.SysAlarmService;
+
+/**
+ * 报警信息Controller
+ * @author ChenSir
+ * @email 914769835
+ * @date 2024-03-17
+ */
+@RestController
+@RequestMapping("/system/sysAlarm")
+public class SysAlarmController extends BaseController {
+
+    @Autowired
+    private SysAlarmService sysAlarmService;
+
+    /**
+     * 查询报警信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysAlarm:list')")
+    @GetMapping("/list")
+    public R<PageInfo> list(SysAlarm sysAlarm, HttpServletRequest request, HttpServletResponse response) {
+        sysAlarm.setPage(new PageDomain(request, response));
+        return R.data(sysAlarmService.findPage(sysAlarm));
+    }
+
+    /**
+     * 获取报警信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysAlarm:query')")
+    @GetMapping(value = "/{id}")
+    public R<SysAlarm> detail(@PathVariable("id") String id) {
+        return R.data(sysAlarmService.get(id));
+    }
+
+    /**
+     * 新增报警信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysAlarm:add')")
+    @Log(title = "报警信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R add(@RequestBody @Validated  SysAlarm sysAlarm) {
+        return R.status(sysAlarmService.save(sysAlarm));
+    }
+
+    /**
+     * 修改报警信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysAlarm:edit')")
+    @Log(title = "报警信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R edit(@RequestBody @Validated SysAlarm sysAlarm) {
+        return R.status(sysAlarmService.save(sysAlarm));
+    }
+
+    /**
+     * 删除报警信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysAlarm:remove')")
+    @Log(title = "报警信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R remove(@PathVariable String[] ids) {
+        return R.status(sysAlarmService.deleteSysAlarmByIds(ids));
+    }
+
+
+    /**
+     * 导出报警信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysAlarm:export')")
+    @Log(title = "报警信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public R export(SysAlarm sysAlarm) {
+        List<SysAlarm> list = sysAlarmService.findList(sysAlarm);
+        ExcelUtil<SysAlarm> util = new ExcelUtil<SysAlarm>(SysAlarm.class);
+        return util.exportExcel(list, "报警信息数据");
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息等其他自定义信息
+     */
+    @GetMapping(value = "/getInitData/{dictTypes}")
+    public R getInitData(@PathVariable String dictTypes) {
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        dataMap.putAll(DictUtils.getMultiDictList(dictTypes));
+        return R.data(dataMap);
+    }
+
+}

aidex-controller/src/main/java/com/aidex/web/controller/system/SysDictTypeController.java

@@ -22,7 +22,7 @@ import java.util.Map;
 
 /**
  * 数据字典信息
- * 
+ *
  * @author ruoyi
  */
 @RestController

aidex-controller/src/main/java/com/aidex/web/controller/system/SysLoginController.java

@@ -5,10 +5,8 @@ import com.aidex.common.core.domain.AjaxResult;
 import com.aidex.common.core.domain.entity.SysMenu;
 import com.aidex.common.core.domain.entity.SysUser;
 import com.aidex.common.core.domain.model.LoginBody;
-import com.aidex.common.core.domain.model.LoginUser;
 import com.aidex.common.core.redis.RedisCache;
 import com.aidex.common.utils.SecurityUtils;
-import com.aidex.common.utils.ServletUtils;
 import com.aidex.framework.web.service.SysLoginService;
 import com.aidex.framework.web.service.SysPermissionService;
 import com.aidex.framework.web.service.TokenService;

aidex-controller/src/main/java/com/aidex/web/controller/system/SysMenuController.java

@@ -194,4 +194,4 @@ public class SysMenuController extends BaseController
         }
         return R.data(checkMap);
     }
-}
+}

aidex-controller/src/main/java/com/aidex/web/controller/system/SysNoticeController.java

@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
  * 公告 信息操作处理
- * 
+ *
  * @author ruoyi
  */
 @RestController

aidex-controller/src/main/java/com/aidex/web/controller/system/SysPostController.java

@@ -6,7 +6,6 @@ import com.aidex.common.core.domain.R;
 import com.aidex.common.core.page.PageDomain;
 import com.aidex.common.enums.BusinessType;
 import com.aidex.common.utils.poi.ExcelUtil;
-import com.aidex.generator.domain.GenConfigTemplate;
 import com.aidex.system.domain.SysPost;
 import com.aidex.system.service.SysPostService;
 import com.github.pagehelper.PageInfo;

aidex-controller/src/main/java/com/aidex/web/controller/system/SysProfileController.java

@@ -9,7 +9,6 @@ import com.aidex.common.core.domain.entity.SysUser;
 import com.aidex.common.core.domain.model.LoginUser;
 import com.aidex.common.enums.BusinessType;
 import com.aidex.common.utils.SecurityUtils;
-import com.aidex.common.utils.ServletUtils;
 import com.aidex.common.utils.file.FileUploadUtils;
 import com.aidex.common.utils.file.MimeTypeUtils;
 import com.aidex.framework.cache.UserUtils;
@@ -19,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 

aidex-controller/src/main/java/com/aidex/web/controller/system/SysRoleController.java

@@ -9,7 +9,6 @@ import com.aidex.common.core.domain.model.LoginUser;
 import com.aidex.common.core.page.PageDomain;
 import com.aidex.common.enums.BusinessType;
 import com.aidex.common.utils.SecurityUtils;
-import com.aidex.common.utils.ServletUtils;
 import com.aidex.common.utils.StringUtils;
 import com.aidex.common.utils.poi.ExcelUtil;
 import com.aidex.framework.web.service.SysPermissionService;

aidex-controller/src/main/java/com/aidex/web/controller/system/SysShipController.java

@@ -0,0 +1,109 @@
+package com.aidex.web.controller.system;
+
+import com.aidex.common.annotation.Log;
+import com.aidex.common.core.controller.BaseController;
+import com.aidex.common.core.domain.R;
+import com.aidex.common.core.page.PageDomain;
+import com.aidex.common.enums.BusinessType;
+import com.aidex.common.utils.poi.ExcelUtil;
+import com.aidex.framework.cache.DictUtils;
+import com.aidex.system.domain.SysShip;
+import com.aidex.system.service.SysShipService;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 船只管理Controller
+ * @author ChenSir
+ * @email 91476835
+ * @date 2024-03-16
+ */
+@RestController
+@RequestMapping("/system/sysShip")
+public class SysShipController extends BaseController {
+
+    @Autowired
+    private SysShipService sysShipService;
+
+    /**
+     * 查询船只管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysShip:list')")
+    @GetMapping("/list")
+    public R<PageInfo> list(SysShip sysShip, HttpServletRequest request, HttpServletResponse response) {
+        sysShip.setPage(new PageDomain(request, response));
+        return R.data(sysShipService.findPage(sysShip));
+    }
+
+    /**
+     * 获取船只管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysShip:query')")
+    @GetMapping(value = "/{id}")
+    public R<SysShip> detail(@PathVariable("id") String id) {
+        return R.data(sysShipService.get(id));
+    }
+
+    /**
+     * 新增船只管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysShip:add')")
+    @Log(title = "船只管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R add(@RequestBody @Validated  SysShip sysShip) {
+        return R.status(sysShipService.save(sysShip));
+    }
+
+    /**
+     * 修改船只管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysShip:edit')")
+    @Log(title = "船只管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R edit(@RequestBody @Validated SysShip sysShip) {
+        return R.status(sysShipService.save(sysShip));
+    }
+
+    /**
+     * 删除船只管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysShip:remove')")
+    @Log(title = "船只管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R remove(@PathVariable String[] ids) {
+        return R.status(sysShipService.deleteSysShipByIds(ids));
+    }
+
+
+    /**
+     * 导出船只管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysShip:export')")
+    @Log(title = "船只管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public R export(SysShip sysShip) {
+        List<SysShip> list = sysShipService.findList(sysShip);
+        ExcelUtil<SysShip> util = new ExcelUtil<SysShip>(SysShip.class);
+        return util.exportExcel(list, "船只管理数据");
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息等其他自定义信息
+     */
+    @GetMapping(value = "/getInitData/{dictTypes}")
+    public R getInitData(@PathVariable String dictTypes) {
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        dataMap.putAll(DictUtils.getMultiDictList(dictTypes));
+        return R.data(dataMap);
+    }
+
+}

aidex-controller/src/main/java/com/aidex/web/controller/system/SysTableConfigController.java

@@ -108,4 +108,4 @@ public class SysTableConfigController extends BaseController
         return util.exportExcel(list, "sysTableConfig");
     }
 
-}
+}

aidex-controller/src/main/java/com/aidex/web/controller/system/SysWharfController.java

@@ -0,0 +1,109 @@
+package com.aidex.web.controller.system;
+
+import com.aidex.common.annotation.Log;
+import com.aidex.common.core.controller.BaseController;
+import com.aidex.common.core.domain.R;
+import com.aidex.common.core.page.PageDomain;
+import com.aidex.common.enums.BusinessType;
+import com.aidex.common.utils.poi.ExcelUtil;
+import com.aidex.framework.cache.DictUtils;
+import com.aidex.system.domain.SysWharf;
+import com.aidex.system.service.SysWharfService;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 码头管理Controller
+ * @author ChenSir
+ * @email 914769835
+ * @date 2024-03-16
+ */
+@RestController
+@RequestMapping("/system/sysWharf")
+public class SysWharfController extends BaseController {
+
+    @Autowired
+    private SysWharfService sysWharfService;
+
+    /**
+     * 查询码头管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysWharf:list')")
+    @GetMapping("/list")
+    public R<PageInfo> list(SysWharf sysWharf, HttpServletRequest request, HttpServletResponse response) {
+        sysWharf.setPage(new PageDomain(request, response));
+        return R.data(sysWharfService.findPage(sysWharf));
+    }
+
+    /**
+     * 获取码头管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysWharf:query')")
+    @GetMapping(value = "/{id}")
+    public R<SysWharf> detail(@PathVariable("id") String id) {
+        return R.data(sysWharfService.get(id));
+    }
+
+    /**
+     * 新增码头管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysWharf:add')")
+    @Log(title = "码头管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R add(@RequestBody @Validated  SysWharf sysWharf) {
+        return R.status(sysWharfService.save(sysWharf));
+    }
+
+    /**
+     * 修改码头管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysWharf:edit')")
+    @Log(title = "码头管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R edit(@RequestBody @Validated SysWharf sysWharf) {
+        return R.status(sysWharfService.save(sysWharf));
+    }
+
+    /**
+     * 删除码头管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysWharf:remove')")
+    @Log(title = "码头管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R remove(@PathVariable String[] ids) {
+        return R.status(sysWharfService.deleteSysWharfByIds(ids));
+    }
+
+
+    /**
+     * 导出码头管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysWharf:export')")
+    @Log(title = "码头管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public R export(SysWharf sysWharf) {
+        List<SysWharf> list = sysWharfService.findList(sysWharf);
+        ExcelUtil<SysWharf> util = new ExcelUtil<SysWharf>(SysWharf.class);
+        return util.exportExcel(list, "码头管理数据");
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息等其他自定义信息
+     */
+    @GetMapping(value = "/getInitData/{dictTypes}")
+    public R getInitData(@PathVariable String dictTypes) {
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        dataMap.putAll(DictUtils.getMultiDictList(dictTypes));
+        return R.data(dataMap);
+    }
+
+}

aidex-framework/src/main/java/com/aidex/framework/aspectj/LogAspect.java

@@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.HandlerMapping;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

aidex-framework/src/main/java/com/aidex/framework/web/service/SysLoginService.java

@@ -6,7 +6,6 @@ import com.aidex.common.constant.CacheConstants;
 import com.aidex.common.core.domain.entity.SysUser;
 import com.aidex.common.core.domain.entity.SysUserMenu;
 import com.aidex.common.exception.ExpireException;
-import com.aidex.common.exception.user.UserPasswordRetryLimitExceedException;
 import com.aidex.common.utils.DateUtils;
 import com.aidex.common.utils.ServletUtils;
 import com.aidex.common.utils.StringUtils;
@@ -33,7 +32,7 @@ import com.aidex.framework.manager.factory.AsyncFactory;
 
 /**
  * 登录校验方法
- * 
+ *
  * @author ruoyi
  */
 @Component
@@ -59,7 +58,7 @@ public class SysLoginService
     private boolean soloLogin;
     /**
      * 登录验证
-     * 
+     *
      * @param username 用户名
      * @param password 密码
      * @param code 验证码

aidex-framework/src/main/java/com/aidex/framework/web/service/SysPermissionService.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 用户权限处理
- * 
+ *
  * @author ruoyi
  */
 @Component
@@ -25,7 +25,7 @@ public class SysPermissionService
 
     /**
      * 获取角色数据权限
-     * 
+     *
      * @param user 用户信息
      * @return 角色权限信息
      */
@@ -46,7 +46,7 @@ public class SysPermissionService
 
     /**
      * 获取菜单数据权限
-     * 
+     *
      * @param user 用户信息
      * @return 菜单权限信息
      */

aidex-generator/src/main/java/com/aidex/generator/controller/GenController.java

@@ -7,8 +7,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.aidex.common.core.domain.R;
-import com.aidex.common.core.domain.entity.SysMenu;
-import com.aidex.system.service.SysMenuService;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,7 +33,7 @@ import com.aidex.generator.service.IGenTableService;
 
 /**
  * 代码生成 操作处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -254,4 +252,4 @@ public class GenController extends BaseController
         response.setContentType("application/octet-stream; charset=UTF-8");
         IOUtils.write(data, response.getOutputStream());
     }
-}
+}

aidex-generator/src/main/java/com/aidex/generator/util/VelocityUtils.java

@@ -14,7 +14,6 @@ import com.aidex.system.service.SysMenuService;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSON;
 import org.apache.velocity.VelocityContext;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import java.io.File;

aidex-quartz/src/main/java/com/aidex/quartz/task/GetAlarmDataByDevice.java

@@ -0,0 +1,122 @@
+package com.aidex.quartz.task;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.http.HttpRequest;
+import com.aidex.common.constant.Constants;
+import com.aidex.common.core.domain.BaseEntity;
+import com.aidex.common.core.redis.RedisCache;
+import com.aidex.common.utils.StringUtils;
+import com.aidex.framework.cache.ConfigUtils;
+import com.aidex.system.domain.SysAlarm;
+import com.aidex.system.domain.SysConfig;
+import com.aidex.system.domain.SysShip;
+import com.aidex.system.service.SysAlarmService;
+import com.aidex.system.service.SysShipService;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.aidex.common.enums.AlarmType.*;
+
+/**
+ * @author ：XueRuiXing
+ * @date ：Created in 2024/3/17 20:07
+ * @description：单台设备报警详单-根据起止时间和报警编号，获取告警的详细信息。
+ */
+@Component("GetAlarmDataByDevice")
+public class GetAlarmDataByDevice {
+
+	protected static final Logger logger = LoggerFactory.getLogger(GetAlarmDataByDevice.class);
+
+	@Autowired
+	private RedisCache redisCache;
+
+	@Autowired
+	private SysShipService sysShipService;
+
+	@Autowired
+	private SysAlarmService alarmService;
+
+	private final String ACTION_URL = "/GetDataService.aspx";
+
+
+	/**
+	 * 刷新GPS的token
+	 * @return token
+	 */
+	public void getDataService(){
+		logger.info("通过船只编号获取设备报警数据----------开始");
+		try{
+			SysShip sysShip = new SysShip();
+			sysShip.setDelFlag(BaseEntity.DEL_FLAG_NORMAL);
+			List<SysShip> list = sysShipService.findList(sysShip);
+			String mds = redisCache.getStringValue(Constants.GPS_TOKEN_PREFIX);
+			SysConfig configUrl = ConfigUtils.getConfigByKey("sys.gps.api.url");
+			// 获取当前时间的毫秒值
+			long currentTimeMillis = DateUtil.current();
+			// 获取当天零点时间的毫秒值
+			long startOfDay = DateUtil.beginOfDay(new Date()).getTime();
+			StringBuilder builder = new StringBuilder();
+			builder.append(OUT_AGE.getCode()).append(",").append(LOW_SPEED.getCode()).append(",").append(OVER_SPEED.getCode());
+			for (SysShip item : list){
+				if (configUrl != null && StringUtils.isNotBlank(mds)) {
+					String url = configUrl.getConfigValue();
+					Map<String, Object> paramMap = new HashMap<>();
+					paramMap.put("method", "QueryApi");
+					paramMap.put("w", "AlarmDetails");
+					paramMap.put("mds", mds);
+					paramMap.put("macid", item.getShipNum());
+					/*paramMap.put("startTime", currentTimeMillis);
+					paramMap.put("endTime", startOfDay);*/
+					paramMap.put("startTime", "1709222400000");
+					paramMap.put("endTime", "1710604800000");
+					paramMap.put("mapType", "QQ");
+					paramMap.put("alarmTypes", builder.toString());
+					logger.info("请求参数:{}", paramMap);
+					//链式构建请求
+					String result = HttpRequest.post(url + ACTION_URL)
+							.form(paramMap)//表单内容
+							.timeout(50000)//超时，毫秒
+							.execute().body();
+					logger.info("请求结果:{}", result);
+					if (result != null) {
+						JSONObject jsonObjec = JSONObject.parseObject(result);
+						if (jsonObjec.getBoolean("success")){
+							logger.info("通过船只编号获取设备报警数据,船只编号----{}，获取数据为为-----{}", item.getShipNum(), jsonObjec.getJSONArray("data"));
+							JSONArray data  = jsonObjec.getJSONArray("data");
+							for (int i = 0; i < data.size(); i++) {
+								JSONObject json = data.getJSONObject(i);
+								SysAlarm sysAlarm = JSONObject.parseObject(json.toJSONString(), SysAlarm.class);
+								sysAlarm.setId(json.getString("alarmid"));
+								sysAlarm.setObjectId(json.getString("objectid"));
+								sysAlarm.setMacId(json.getString("macid"));
+								SysAlarm sysAlarmHis = alarmService.get(json.getString("alarmid"));
+								if (sysAlarmHis == null) {
+									sysAlarm.setIsNewRecord();
+									alarmService.save(sysAlarm);
+								}
+							}
+						}else {
+							logger.info("Gps平台获取token初始化结束,Http 请求结果错误！-----{}", jsonObjec);
+						}
+					}else {
+						logger.info("Gps平台获取token初始化结束,Http 请求结果为空！");
+					}
+				}
+			}
+		}catch (Exception e){
+			logger.error(e.getLocalizedMessage());
+		}
+		logger.info("通过船只编号获取设备报警数据----------结束");
+	}
+
+
+}

aidex-quartz/src/main/java/com/aidex/quartz/task/RefreshMdsTask.java

@@ -0,0 +1,118 @@
+package com.aidex.quartz.task;
+
+import cn.hutool.http.HttpRequest;
+import com.aidex.common.constant.Constants;
+import com.aidex.common.core.redis.RedisCache;
+import com.aidex.common.utils.StringUtils;
+import com.aidex.framework.cache.ConfigUtils;
+import com.aidex.system.domain.SysConfig;
+import com.alibaba.fastjson2.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author ：XueRuiXing
+ * @date ：Created in 2024/3/17 20:07
+ * @description：由于mds令牌有时效性，某些场景（模块或页面）需要线程常驻，那么需要mds长期有效，由于接口调用可以顺延mds的时效，建议定时器每隔5分钟请求一次本接口，确保mds不会过期。
+ */
+@Component("RefreshMdsTask")
+public class RefreshMdsTask {
+
+	protected static final Logger logger = LoggerFactory.getLogger(RefreshMdsTask.class);
+
+	@Autowired
+	private RedisCache redisCache;
+
+	private final String ACTION_URL = "/GetDataService.aspx";
+
+
+	/**
+	 * 刷新GPS的token
+	 * @return token
+	 */
+	public String refreshGPSToken(){
+		logger.info("刷新GPS的token----------开始");
+		String token = "";
+		try{
+			String mds = redisCache.getStringValue(Constants.GPS_TOKEN_PREFIX);
+			SysConfig configUrl = ConfigUtils.getConfigByKey("sys.gps.api.url");
+			if (configUrl != null && StringUtils.isNotBlank(mds)) {
+				String url = configUrl.getConfigValue();
+				Map<String, Object> paramMap = new HashMap<>();
+				paramMap.put("w", "RefreshMds");
+				paramMap.put("method", "QueryApi");
+				paramMap.put("mds", mds);
+				//链式构建请求
+				String result = HttpRequest.post(url + ACTION_URL)
+						.form(paramMap)//表单内容
+						.timeout(10000)//超时，毫秒
+						.execute().body();
+				logger.info("请求结果:{}", result);
+				if (result != null) {
+					JSONObject jsonObjec = JSONObject.parseObject(result);
+					if (jsonObjec.getBoolean("success")){
+						logger.info("Gps平台刷新token结束,获取token为-----{}", mds);
+						redisCache.expire(Constants.GPS_TOKEN_PREFIX, Constants.GPS_TOKEN_EXPIRATION, TimeUnit.MINUTES);
+					}else {
+						logger.info("Gps平台获取token初始化结束,Http 请求结果错误！-----{}", jsonObjec);
+						// 重新获取token
+						getGpsToken();
+					}
+				}else {
+					logger.info("Gps平台获取token初始化结束,Http 请求结果为空！");
+				}
+			}
+		}catch (Exception e){
+			token = e.getLocalizedMessage();
+		}
+		logger.info("刷新GPS的token----------结束");
+		return token;
+	}
+
+	public void getGpsToken(){
+		logger.info("Gps平台获取token重新获取开始");
+		SysConfig configAccount = ConfigUtils.getConfigByKey("sys.gps.account");
+		SysConfig configPassword = ConfigUtils.getConfigByKey("sys.gps.password");
+		SysConfig configUrl = ConfigUtils.getConfigByKey("sys.gps.api.url");
+		if (configUrl != null && configPassword != null && configAccount != null) {
+			String account = configAccount.getConfigValue();
+			String password = configPassword.getConfigValue();
+			String url = configUrl.getConfigValue();
+			Map<String, Object> paramMap = new HashMap<>();
+			paramMap.put("userName", account);
+			paramMap.put("password", password);
+			paramMap.put("w", "UserLogin");
+			paramMap.put("method", "SignApi");
+			//链式构建请求
+			String result = HttpRequest.post(url + ACTION_URL)
+					.form(paramMap)//表单内容
+					.timeout(10000)//超时，毫秒
+					.execute().body();
+			logger.info("请求结果:{}", result);
+			if (result != null) {
+				JSONObject jsonObjec = JSONObject.parseObject(result);
+				if (jsonObjec.getBoolean("success")){
+					JSONObject token = jsonObjec.getJSONObject("data");
+					if (token != null && StringUtils.isNotEmpty(token.getString("mds"))){
+						redisCache.deleteKey(Constants.GPS_TOKEN_PREFIX);
+						redisCache.setCacheObject(Constants.GPS_TOKEN_PREFIX, token.getString("mds"), Constants.GPS_TOKEN_EXPIRATION, TimeUnit.MINUTES);
+					}else {
+						logger.info("Gps平台获取token重新获取结束,Http 请求结果不包含token信息！-----{}", jsonObjec);
+					}
+				}else {
+					logger.info("Gps平台获取token重新获取结束,Http 请求结果错误！-----{}", jsonObjec);
+				}
+			}else {
+				logger.info("Gps平台获取token重新获取结束,Http 请求结果为空！");
+			}
+		}
+		logger.info("Gps平台获取token重新获取结束");
+	}
+
+}

aidex-system/pom.xml

@@ -48,6 +48,14 @@
             <version>${commons-beanutils.version}</version>
         </dependency>
 
+        <!--引入hutool工具类 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.26</version>
+        </dependency>
+
+
         <!--阿里短信服务 -->
         <dependency>
             <groupId>com.aliyun</groupId>
@@ -62,4 +70,4 @@
         </dependency>
 
     </dependencies>
-</project>
+</project>

aidex-system/src/main/java/com/aidex/framework/cache/ConfigUtils.java

@@ -1,7 +1,6 @@
 package com.aidex.framework.cache;
 
 import com.aidex.common.constant.CacheConstants;
-import com.aidex.common.constant.Constants;
 import com.aidex.common.core.redis.RedisCache;
 import com.aidex.common.core.text.Convert;
 import com.aidex.common.utils.spring.SpringUtils;

aidex-system/src/main/java/com/aidex/framework/cache/DeptUtils.java

@@ -1,7 +1,6 @@
 package com.aidex.framework.cache;
 
 import com.aidex.common.constant.CacheConstants;
-import com.aidex.common.constant.Constants;
 import com.aidex.common.core.domain.entity.SysDept;
 import com.aidex.common.core.domain.entity.SysUser;
 import com.aidex.common.core.domain.model.LoginUser;

aidex-system/src/main/java/com/aidex/framework/cache/DictUtils.java

@@ -1,7 +1,6 @@
 package com.aidex.framework.cache;
 
 import com.aidex.common.constant.CacheConstants;
-import com.aidex.common.constant.Constants;
 import com.aidex.common.core.domain.BaseEntity;
 import com.aidex.common.core.redis.RedisCache;
 import com.aidex.common.utils.StringUtils;

aidex-system/src/main/java/com/aidex/framework/cache/MyInitializer.java

@@ -0,0 +1,76 @@
+package com.aidex.framework.cache;
+
+import cn.hutool.http.HttpRequest;
+import com.aidex.common.constant.Constants;
+import com.aidex.common.core.redis.RedisCache;
+import com.aidex.common.utils.StringUtils;
+import com.aidex.system.domain.SysConfig;
+import com.alibaba.fastjson2.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ * @author ：XueRuiXing
+ * @date ：Created in 2024/3/17 13:33
+ * @description：初始话获取gps平台的token，存入redis
+ */
+@Component
+public class MyInitializer {
+
+	protected static final Logger logger = LoggerFactory.getLogger(MyInitializer.class);
+
+	@Autowired
+	private RedisCache redisCache;
+
+	private final String ACTION_URL = "/GetDataService.aspx";
+
+	@PostConstruct
+	public void init() {
+		logger.info("Gps平台获取token初始化开始");
+		SysConfig configAccount = ConfigUtils.getConfigByKey("sys.gps.account");
+		SysConfig configPassword = ConfigUtils.getConfigByKey("sys.gps.password");
+		SysConfig configUrl = ConfigUtils.getConfigByKey("sys.gps.api.url");
+		if (configUrl != null && configPassword != null && configAccount != null) {
+			String account = configAccount.getConfigValue();
+			String password = configPassword.getConfigValue();
+			String url = configUrl.getConfigValue();
+			Map<String, Object> paramMap = new HashMap<>();
+			paramMap.put("userName", account);
+			paramMap.put("password", password);
+			paramMap.put("w", "UserLogin");
+			paramMap.put("method", "SignApi");
+			//链式构建请求
+			String result = HttpRequest.post(url + ACTION_URL)
+					.form(paramMap)//表单内容
+					.timeout(10000)//超时，毫秒
+					.execute().body();
+			logger.info("请求结果:{}", result);
+			if (result != null) {
+				JSONObject jsonObjec = JSONObject.parseObject(result);
+				if (jsonObjec.getBoolean("success")){
+					JSONObject token = jsonObjec.getJSONObject("data");
+					if (token != null && StringUtils.isNotEmpty(token.getString("mds"))){
+						redisCache.setCacheObject(Constants.GPS_TOKEN_PREFIX, token.getString("mds"), Constants.GPS_TOKEN_EXPIRATION, TimeUnit.MINUTES);
+					}else {
+						logger.info("Gps平台获取token初始化结束,Http 请求结果不包含token信息！-----{}", jsonObjec);
+					}
+				}else {
+					logger.info("Gps平台获取token初始化结束,Http 请求结果错误！-----{}", jsonObjec);
+				}
+			}else {
+				logger.info("Gps平台获取token初始化结束,Http 请求结果为空！");
+			}
+		}
+		logger.info("Gps平台获取token初始化结束");
+	}
+
+
+}

aidex-system/src/main/java/com/aidex/framework/cache/RoleUtils.java

@@ -1,7 +1,6 @@
 package com.aidex.framework.cache;
 
 import com.aidex.common.constant.CacheConstants;
-import com.aidex.common.constant.Constants;
 import com.aidex.common.core.domain.entity.SysRole;
 import com.aidex.common.core.redis.RedisCache;
 import com.aidex.common.utils.spring.SpringUtils;

aidex-system/src/main/java/com/aidex/framework/cache/TableConfigUtils.java

@@ -1,7 +1,6 @@
 package com.aidex.framework.cache;
 
 import com.aidex.common.constant.CacheConstants;
-import com.aidex.common.constant.Constants;
 import com.aidex.common.core.redis.RedisCache;
 import com.aidex.common.utils.spring.SpringUtils;
 import com.aidex.system.domain.SysTableConfig;

aidex-system/src/main/java/com/aidex/framework/cache/UserUtils.java

@@ -1,7 +1,6 @@
 package com.aidex.framework.cache;
 
 import com.aidex.common.constant.CacheConstants;
-import com.aidex.common.constant.Constants;
 import com.aidex.common.core.domain.entity.SysMenu;
 import com.aidex.common.core.domain.entity.SysRole;
 import com.aidex.common.core.domain.entity.SysUser;

aidex-system/src/main/java/com/aidex/system/domain/SysAlarm.java

@@ -0,0 +1,292 @@
+package com.aidex.system.domain;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.aidex.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.aidex.common.utils.log.annotation.FieldRemark;
+import com.aidex.common.utils.log.annotation.LogField;
+import com.aidex.common.annotation.Excel;
+
+/**
+ * 报警信息对象 sys_alarm
+ * @author ChenSir
+ * @email 914769835
+ * @date 2024-03-17
+ */
+@Data
+public class SysAlarm extends BaseEntity<SysAlarm>
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备ID */
+    @NotBlank(message = "设备ID不允许为空")
+    @LogField
+    @FieldRemark(name = "设备ID",field = "objectId")
+    private String objectId;
+
+    /** 设备号（IMEI） */
+    @Excel(name = "设备号")
+    @NotBlank(message = "设备号（IMEI）不允许为空")
+    @LogField
+    @FieldRemark(name = "设备号",field = "macId")
+    private String macId;
+
+    /** 设备名称（昵称） */
+    @LogField
+    @FieldRemark(name = "设备名称",field = "fullName")
+    private String fullName;
+
+    /** 设备型号 */
+    @LogField
+    @FieldRemark(name = "设备型号",field = "macName")
+    private String macName;
+
+    /** 发生时间（格式：utc时间戳毫秒数） */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @LogField
+    @FieldRemark(name = "发生时间",field = "alarmime")
+    private Date alarmime;
+
+    /** 发生时间（格式：utc时间戳毫秒数）开始 */
+    private String beginAlarmime;
+
+    /** 发生时间（格式：utc时间戳毫秒数）结束 */
+    private String endAlarmime;
+
+    /** 服务器处理时间（格式：utc时间戳毫秒数） */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "服务器处理时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @LogField
+    @FieldRemark(name = "服务器处理时间",field = "addtime")
+    private Date addtime;
+
+    /** 服务器处理时间（格式：utc时间戳毫秒数）开始 */
+    private String beginAddtime;
+
+    /** 服务器处理时间（格式：utc时间戳毫秒数）结束 */
+    private String endAddtime;
+
+    /** 速度（单位：km/h） */
+    @Excel(name = "速度")
+    @LogField
+    @FieldRemark(name = "速度",field = "speed")
+    private String speed;
+
+    /** 纬度（坐标系根据mapType调整） */
+    @Excel(name = "纬度")
+    @LogField
+    @FieldRemark(name = "纬度",field = "lat")
+    private String lat;
+
+    /** 经度（坐标系根据mapType调整） */
+    @Excel(name = "经度")
+    @LogField
+    @FieldRemark(name = "经度",field = "lon")
+    private String lon;
+
+    /** 方向 */
+    @Excel(name = "方向")
+    @LogField
+    @FieldRemark(name = "方向",field = "dir")
+    private String dir;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    @LogField
+    @FieldRemark(name = "描述",field = "describe")
+    private String describe;
+
+    /** 报警编号 */
+    @Excel(name = "报警编号")
+    @LogField
+    @FieldRemark(name = "报警编号",field = "alarmType")
+    private Long alarmType;
+
+    /** 二级分类 */
+    @LogField
+    @FieldRemark(name = "二级分类",field = "classify")
+    private String classify;
+
+    /** 状态（0未处理 1已处理） */
+    @Excel(name = "状态", dictType = "sys_alarm_status")
+    @NotBlank(message = "状态（0未处理 1已处理）不允许为空")
+    @LogField
+    @FieldRemark(name = "状态",field = "status")
+    private String status;
+
+    public void setObjectId(String objectId)
+    {
+        this.objectId = objectId;
+    }
+
+    public String getObjectId()
+    {
+        return objectId;
+    }
+
+    public void setMacId(String macId)
+    {
+        this.macId = macId;
+    }
+
+    public String getMacId()
+    {
+        return macId;
+    }
+
+    public void setFullName(String fullName)
+    {
+        this.fullName = fullName;
+    }
+
+    public String getFullName()
+    {
+        return fullName;
+    }
+
+    public void setMacName(String macName)
+    {
+        this.macName = macName;
+    }
+
+    public String getMacName()
+    {
+        return macName;
+    }
+
+    public void setAlarmime(Date alarmime)
+    {
+        this.alarmime = alarmime;
+    }
+
+    public Date getAlarmime()
+    {
+        return alarmime;
+    }
+
+    public void setAddtime(Date addtime)
+    {
+        this.addtime = addtime;
+    }
+
+    public Date getAddtime()
+    {
+        return addtime;
+    }
+
+    public void setSpeed(String speed)
+    {
+        this.speed = speed;
+    }
+
+    public String getSpeed()
+    {
+        return speed;
+    }
+
+    public void setLat(String lat)
+    {
+        this.lat = lat;
+    }
+
+    public String getLat()
+    {
+        return lat;
+    }
+
+    public void setLon(String lon)
+    {
+        this.lon = lon;
+    }
+
+    public String getLon()
+    {
+        return lon;
+    }
+
+    public void setDir(String dir)
+    {
+        this.dir = dir;
+    }
+
+    public String getDir()
+    {
+        return dir;
+    }
+
+    public void setDescribe(String describe)
+    {
+        this.describe = describe;
+    }
+
+    public String getDescribe()
+    {
+        return describe;
+    }
+
+    public void setAlarmType(Long alarmType)
+    {
+        this.alarmType = alarmType;
+    }
+
+    public Long getAlarmType()
+    {
+        return alarmType;
+    }
+
+    public void setClassify(String classify)
+    {
+        this.classify = classify;
+    }
+
+    public String getClassify()
+    {
+        return classify;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("objectId", getObjectId())
+            .append("macId", getMacId())
+            .append("fullName", getFullName())
+            .append("macName", getMacName())
+            .append("alarmime", getAlarmime())
+            .append("addtime", getAddtime())
+            .append("speed", getSpeed())
+            .append("lat", getLat())
+            .append("lon", getLon())
+            .append("dir", getDir())
+            .append("describe", getDescribe())
+            .append("alarmtype", getAlarmType())
+            .append("classify", getClassify())
+            .append("status", getStatus())
+            .append("remark", getRemark())
+            .append("id", getId())
+            .append("createBy", getCreateBy())
+            .append("createDept", getCreateDept())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateIp", getUpdateIp())
+            .append("version", getVersion())
+            .append("delFlag", getDelFlag())
+            .toString();
+    }
+}

aidex-system/src/main/java/com/aidex/system/domain/SysCache.java

@@ -5,7 +5,7 @@ import com.aidex.common.utils.StringUtils;
 
 /**
  * 缓存信息
- * 
+ *
  * @author ruoyi
  */
 public class SysCache

aidex-system/src/main/java/com/aidex/system/domain/SysCommonUseMenu.java

@@ -43,32 +43,32 @@ public class SysCommonUseMenu extends BaseEntity<SysCommonUseMenu>
     /** 排序 */
     private Integer sort;
 
-    public void setUserId(String userId) 
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }
 
-    public String getUserId() 
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setMenuObj(String menuObj) 
+    public void setMenuObj(String menuObj)
     {
         this.menuObj = menuObj;
     }
 
-    public String getMenuObj() 
+    public String getMenuObj()
     {
         return menuObj;
     }
 
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }

aidex-system/src/main/java/com/aidex/system/domain/SysConfig.java

@@ -41,7 +41,7 @@ public class SysConfig extends BaseEntity<SysConfig>
     /** 系统内置（Y是 N否） */
     @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
     private String configType;
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

aidex-system/src/main/java/com/aidex/system/domain/SysDictData.java

@@ -12,7 +12,7 @@ import javax.validation.constraints.Size;
 
 /**
  * 字典数据表 sys_dict_data
- * 
+ *
  * @author ruoyi
  */
 public class SysDictData extends BaseEntity<SysDictData>

aidex-system/src/main/java/com/aidex/system/domain/SysDictType.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.Size;
 
 /**
  * 字典类型表 sys_dict_type
- * 
+ *
  * @author ruoyi
  */
 @Data
@@ -71,7 +71,7 @@ public class SysDictType extends BaseEntity<SysDictType>
         this.status = status;
     }
 
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

aidex-system/src/main/java/com/aidex/system/domain/SysLoginLog.java

@@ -3,14 +3,13 @@ package com.aidex.system.domain;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.aidex.common.annotation.Excel;
-import com.aidex.common.annotation.Excel.ColumnType;
 import com.aidex.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * 系统访问记录表 sys_login_log
- * 
+ *
  * @author ruoyi
  */
 @Data

aidex-system/src/main/java/com/aidex/system/domain/SysNotice.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.Size;
 
 /**
  * 通知公告表 sys_notice
- * 
+ *
  * @author ruoyi
  */
 @Data
@@ -43,6 +43,19 @@ public class SysNotice extends BaseEntity<SysNotice>
     @FieldRemark(field = "status", name = "公告状态")
     private String status;
 
+
+    /** 是否置顶（0否 1是） */
+    @FieldRemark(field = "topping", name = "公告状态")
+    private String topping;
+
+    /** 是否轮播（0否 1是） */
+    @FieldRemark(field = "carousel", name = "是否轮播")
+    private String carousel;
+
+
+    // 轮播图地址
+    @FieldRemark(field = "carousel_img_url", name = "轮播图地址")
+    private String carouselImgUrl;
     private String createByName;
     private String userId;
     private String isRead;//消息是否已读

aidex-system/src/main/java/com/aidex/system/domain/SysNoticeUserRead.java

@@ -40,42 +40,42 @@ public class SysNoticeUserRead extends BaseEntity<SysNoticeUserRead>
     @NotBlank(message = "状态不允许为空")
     private String status;
 
-    public void setNoticeId(String noticeId) 
+    public void setNoticeId(String noticeId)
     {
         this.noticeId = noticeId;
     }
 
-    public String getNoticeId() 
+    public String getNoticeId()
     {
         return noticeId;
     }
 
-    public void setUserId(String userId) 
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }
 
-    public String getUserId() 
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setIsRead(String isRead) 
+    public void setIsRead(String isRead)
     {
         this.isRead = isRead;
     }
 
-    public String getIsRead() 
+    public String getIsRead()
     {
         return isRead;
     }
 
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }

aidex-system/src/main/java/com/aidex/system/domain/SysOperLog.java

@@ -3,14 +3,13 @@ package com.aidex.system.domain;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.aidex.common.annotation.Excel;
-import com.aidex.common.annotation.Excel.ColumnType;
 import com.aidex.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * 操作日志记录表 oper_log
- * 
+ *
  * @author ruoyi
  */
 @Data

aidex-system/src/main/java/com/aidex/system/domain/SysPortalConfig.java

@@ -1,6 +1,5 @@
 package com.aidex.system.domain;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 
 import lombok.EqualsAndHashCode;
@@ -8,7 +7,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import lombok.Data;
 import com.aidex.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.aidex.common.annotation.Excel;
 /**
  * 多栏目门户配置对象 sys_portal_config
@@ -61,92 +59,92 @@ public class SysPortalConfig extends BaseEntity<SysPortalConfig>
     /** 状态 */
     private String status;
 
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
 
-    public void setCode(String code) 
+    public void setCode(String code)
     {
         this.code = code;
     }
 
-    public String getCode() 
+    public String getCode()
     {
         return code;
     }
 
-    public void setApplicationRange(String applicationRange) 
+    public void setApplicationRange(String applicationRange)
     {
         this.applicationRange = applicationRange;
     }
 
-    public String getApplicationRange() 
+    public String getApplicationRange()
     {
         return applicationRange;
     }
 
-    public void setIsDefault(String isDefault) 
+    public void setIsDefault(String isDefault)
     {
         this.isDefault = isDefault;
     }
 
-    public String getIsDefault() 
+    public String getIsDefault()
     {
         return isDefault;
     }
 
-    public void setResourceId(String resourceId) 
+    public void setResourceId(String resourceId)
     {
         this.resourceId = resourceId;
     }
 
-    public String getResourceId() 
+    public String getResourceId()
     {
         return resourceId;
     }
 
-    public void setSystemDefinedId(String systemDefinedId) 
+    public void setSystemDefinedId(String systemDefinedId)
     {
         this.systemDefinedId = systemDefinedId;
     }
 
-    public String getSystemDefinedId() 
+    public String getSystemDefinedId()
     {
         return systemDefinedId;
     }
 
-    public void setContent(String content) 
+    public void setContent(String content)
     {
         this.content = content;
     }
 
-    public String getContent() 
+    public String getContent()
     {
         return content;
     }
 
-    public void setSort(Long sort) 
+    public void setSort(Long sort)
     {
         this.sort = sort;
     }
 
-    public Long getSort() 
+    public Long getSort()
     {
         return sort;
     }
 
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }

aidex-system/src/main/java/com/aidex/system/domain/SysPortlet.java

@@ -1,6 +1,5 @@
 package com.aidex.system.domain;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 
 import lombok.EqualsAndHashCode;
@@ -8,7 +7,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import lombok.Data;
 import com.aidex.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.aidex.common.annotation.Excel;
 /**
  * 门户小页管理对象 sys_portlet
@@ -65,102 +63,102 @@ public class SysPortlet extends BaseEntity<SysPortlet>
     @NotBlank(message = "状态不允许为空")
     private String status;
 
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
 
-    public void setCode(String code) 
+    public void setCode(String code)
     {
         this.code = code;
     }
 
-    public String getCode() 
+    public String getCode()
     {
         return code;
     }
 
-    public void setUrl(String url) 
+    public void setUrl(String url)
     {
         this.url = url;
     }
 
-    public String getUrl() 
+    public String getUrl()
     {
         return url;
     }
 
-    public void setRefreshRate(String refreshRate) 
+    public void setRefreshRate(String refreshRate)
     {
         this.refreshRate = refreshRate;
     }
 
-    public String getRefreshRate() 
+    public String getRefreshRate()
     {
         return refreshRate;
     }
 
-    public void setShowTitle(String showTitle) 
+    public void setShowTitle(String showTitle)
     {
         this.showTitle = showTitle;
     }
 
-    public String getShowTitle() 
+    public String getShowTitle()
     {
         return showTitle;
     }
 
-    public void setIsAllowDrag(String isAllowDrag) 
+    public void setIsAllowDrag(String isAllowDrag)
     {
         this.isAllowDrag = isAllowDrag;
     }
 
-    public String getIsAllowDrag() 
+    public String getIsAllowDrag()
     {
         return isAllowDrag;
     }
 
-    public void setxGridNumber(String xGridNumber) 
+    public void setxGridNumber(String xGridNumber)
     {
         this.xGridNumber = xGridNumber;
     }
 
-    public String getxGridNumber() 
+    public String getxGridNumber()
     {
         return xGridNumber;
     }
 
-    public void setyGridNumber(String yGridNumber) 
+    public void setyGridNumber(String yGridNumber)
     {
         this.yGridNumber = yGridNumber;
     }
 
-    public String getyGridNumber() 
+    public String getyGridNumber()
     {
         return yGridNumber;
     }
 
-    public void setSort(Long sort) 
+    public void setSort(Long sort)
     {
         this.sort = sort;
     }
 
-    public Long getSort() 
+    public Long getSort()
     {
         return sort;
     }
 
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }

aidex-system/src/main/java/com/aidex/system/domain/SysPost.java

@@ -44,7 +44,7 @@ public class SysPost extends BaseEntity<SysPost>
 
     /** 用户是否存在此岗位标识 默认不存在 */
     private boolean flag = false;
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

aidex-system/src/main/java/com/aidex/system/domain/SysRoleDept.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 角色和部门关联 sys_role_dept
- * 
+ *
  * @author ruoyi
  */
 @Data
@@ -14,7 +14,7 @@ public class SysRoleDept
 {
     /** 角色ID */
     private String roleId;
-    
+
     /** 部门ID */
     private String deptId;
 

aidex-system/src/main/java/com/aidex/system/domain/SysRoleMenu.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * 角色和菜单关联 sys_role_menu
- * 
+ *
  * @author ruoyi
  */
 @Data
@@ -16,7 +16,7 @@ public class SysRoleMenu
 {
     /** 角色ID */
     private String roleId;
-    
+
     /** 菜单ID */
     private String menuId;
     /**

aidex-system/src/main/java/com/aidex/system/domain/SysShip.java

@@ -0,0 +1,161 @@
+package com.aidex.system.domain;
+
+import com.aidex.common.annotation.Excel;
+import com.aidex.common.core.domain.BaseEntity;
+import com.aidex.common.utils.log.annotation.FieldRemark;
+import com.aidex.common.utils.log.annotation.LogField;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 船只管理对象 sys_ship
+ * @author ChenSir
+ * @email 91476835
+ * @date 2024-03-16
+ */
+@Data
+public class SysShip extends BaseEntity<SysShip>
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 船只编号 */
+    @Excel(name = "船只编号")
+    @NotBlank(message = "船只编号不允许为空")
+    @LogField
+    @FieldRemark(name = "船只编号",field = "shipNum")
+    private String shipNum;
+
+    /** 船只名称 */
+    @Excel(name = "船只名称")
+    @NotBlank(message = "船只名称不允许为空")
+    @LogField
+    @FieldRemark(name = "船只名称",field = "shipNanme")
+    private String shipNanme;
+
+    /** gps设备编号 */
+    @Excel(name = "gps设备编号")
+    @LogField
+    @FieldRemark(name = "gps设备编号",field = "gpsDeviceNum")
+    private String gpsDeviceNum;
+
+    /** 核载人数 */
+    @Excel(name = "核载人数")
+    @LogField
+    @FieldRemark(name = "核载人数",field = "nuclearLoadNum")
+    private Long nuclearLoadNum;
+
+    /** 当前维度 */
+    @Excel(name = "当前维度")
+    @LogField
+    @FieldRemark(name = "当前维度",field = "lat")
+    private String lat;
+
+    /** 当前维度 */
+    @Excel(name = "当前维度")
+    @LogField
+    @FieldRemark(name = "当前维度",field = "lng")
+    private String lng;
+
+    /** 船只在线状态（0 离线 1 在线） */
+    @Excel(name = "船只在线状态", dictType = "sys_ship_status")
+    @LogField
+    @FieldRemark(name = "船只在线状态",field = "status")
+    private String status;
+
+    public void setShipNum(String shipNum)
+    {
+        this.shipNum = shipNum;
+    }
+
+    public String getShipNum()
+    {
+        return shipNum;
+    }
+
+    public void setShipNanme(String shipNanme)
+    {
+        this.shipNanme = shipNanme;
+    }
+
+    public String getShipNanme()
+    {
+        return shipNanme;
+    }
+
+    public void setGpsDeviceNum(String gpsDeviceNum)
+    {
+        this.gpsDeviceNum = gpsDeviceNum;
+    }
+
+    public String getGpsDeviceNum()
+    {
+        return gpsDeviceNum;
+    }
+
+    public void setNuclearLoadNum(Long nuclearLoadNum)
+    {
+        this.nuclearLoadNum = nuclearLoadNum;
+    }
+
+    public Long getNuclearLoadNum()
+    {
+        return nuclearLoadNum;
+    }
+
+    public void setLat(String lat)
+    {
+        this.lat = lat;
+    }
+
+    public String getLat()
+    {
+        return lat;
+    }
+
+    public void setLng(String lng)
+    {
+        this.lng = lng;
+    }
+
+    public String getLng()
+    {
+        return lng;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shipNum", getShipNum())
+            .append("shipNanme", getShipNanme())
+            .append("gpsDeviceNum", getGpsDeviceNum())
+            .append("nuclearLoadNum", getNuclearLoadNum())
+            .append("lat", getLat())
+            .append("lng", getLng())
+            .append("status", getStatus())
+            .append("remark", getRemark())
+            .append("id", getId())
+            .append("createBy", getCreateBy())
+            .append("createDept", getCreateDept())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateIp", getUpdateIp())
+            .append("version", getVersion())
+            .append("delFlag", getDelFlag())
+            .toString();
+    }
+}

aidex-system/src/main/java/com/aidex/system/domain/SysTableConfig.java

@@ -1,6 +1,5 @@
 package com.aidex.system.domain;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 
 import lombok.EqualsAndHashCode;
@@ -117,4 +116,4 @@ public class SysTableConfig extends BaseEntity<SysTableConfig>
                 .append("delFlag", getDelFlag())
                 .toString();
     }
-}
+}

aidex-system/src/main/java/com/aidex/system/domain/SysThemeConfig.java

@@ -39,42 +39,42 @@ public class SysThemeConfig extends BaseEntity<SysThemeConfig>
     @NotBlank(message = "状态（0正常 1删除 2停用）不允许为空")
     private String status;
 
-    public void setUserId(String userId) 
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }
 
-    public String getUserId() 
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setThemeObj(String themeObj) 
+    public void setThemeObj(String themeObj)
     {
         this.themeObj = themeObj;
     }
 
-    public String getThemeObj() 
+    public String getThemeObj()
     {
         return themeObj;
     }
 
-    public void setSort(Integer sort) 
+    public void setSort(Integer sort)
     {
         this.sort = sort;
     }
 
-    public Integer getSort() 
+    public Integer getSort()
     {
         return sort;
     }
 
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }

aidex-system/src/main/java/com/aidex/system/domain/SysUserOnline.java

@@ -6,7 +6,7 @@ import java.util.Date;
 
 /**
  * 当前在线会话
- * 
+ *
  * @author ruoyi
  */
 public class SysUserOnline

aidex-system/src/main/java/com/aidex/system/domain/SysUserPost.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 用户和岗位关联 sys_user_post
- * 
+ *
  * @author ruoyi
  */
 @Data
@@ -14,7 +14,7 @@ public class SysUserPost
 {
     /** 用户ID */
     private String userId;
-    
+
     /** 岗位ID */
     private String postId;
 

aidex-system/src/main/java/com/aidex/system/domain/SysUserRole.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 用户和角色关联 sys_user_role
- * 
+ *
  * @author ruoyi
  */
 @Data
@@ -14,7 +14,7 @@ public class SysUserRole
 {
     /** 用户ID */
     private String userId;
-    
+
     /** 角色ID */
     private String roleId;
 

aidex-system/src/main/java/com/aidex/system/domain/SysWharf.java

@@ -0,0 +1,126 @@
+package com.aidex.system.domain;
+
+import com.aidex.common.annotation.Excel;
+import com.aidex.common.core.domain.BaseEntity;
+import com.aidex.common.utils.log.annotation.FieldRemark;
+import com.aidex.common.utils.log.annotation.LogField;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 码头管理对象 sys_wharf
+ * @author ChenSir
+ * @email 914769835
+ * @date 2024-03-16
+ */
+@Data
+public class SysWharf extends BaseEntity<SysWharf>
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 码头序号 */
+    @Excel(name = "码头序号")
+    @LogField
+    @FieldRemark(name = "码头序号",field = "wharfOrder")
+    private Long wharfOrder;
+
+    /** 码头名称 */
+    @Excel(name = "码头名称")
+    @NotBlank(message = "码头名称不允许为空")
+    @LogField
+    @FieldRemark(name = "码头名称",field = "wharfNanme")
+    private String wharfNanme;
+
+    /** 当前维度 */
+    @Excel(name = "当前维度")
+    @LogField
+    @FieldRemark(name = "当前维度",field = "lat")
+    private String lat;
+
+    /** 当前维度 */
+    @Excel(name = "当前维度")
+    @LogField
+    @FieldRemark(name = "当前维度",field = "lng")
+    private String lng;
+
+    /** 码头状态 */
+    @Excel(name = "码头状态", dictType = "sys_normal_disable")
+    @LogField
+    @FieldRemark(name = "码头状态",field = "status")
+    private String status;
+
+    public void setWharfOrder(Long wharfOrder)
+    {
+        this.wharfOrder = wharfOrder;
+    }
+
+    public Long getWharfOrder()
+    {
+        return wharfOrder;
+    }
+
+    public void setWharfNanme(String wharfNanme)
+    {
+        this.wharfNanme = wharfNanme;
+    }
+
+    public String getWharfNanme()
+    {
+        return wharfNanme;
+    }
+
+    public void setLat(String lat)
+    {
+        this.lat = lat;
+    }
+
+    public String getLat()
+    {
+        return lat;
+    }
+
+    public void setLng(String lng)
+    {
+        this.lng = lng;
+    }
+
+    public String getLng()
+    {
+        return lng;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("wharfOrder", getWharfOrder())
+            .append("wharfNanme", getWharfNanme())
+            .append("lat", getLat())
+            .append("lng", getLng())
+            .append("status", getStatus())
+            .append("remark", getRemark())
+            .append("id", getId())
+            .append("createBy", getCreateBy())
+            .append("createDept", getCreateDept())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateIp", getUpdateIp())
+            .append("version", getVersion())
+            .append("delFlag", getDelFlag())
+            .toString();
+    }
+}

aidex-system/src/main/java/com/aidex/system/domain/vo/ErrorCode.java

@@ -6,7 +6,7 @@
 package com.aidex.system.domain.vo;
 
 public enum ErrorCode {
-	
+
     B_CUSTOMER_companyNameConflict("B_CUSTOMER_companyNameConflict", "客户公司名冲突");
 
     private final String errCode;

aidex-system/src/main/java/com/aidex/system/domain/vo/MetaVo.java

@@ -2,7 +2,7 @@ package com.aidex.system.domain.vo;
 
 /**
  * 路由显示信息
- * 
+ *
  * @author ruoyi
  */
 public class MetaVo

aidex-system/src/main/java/com/aidex/system/domain/vo/RouterVo.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 /**
  * 路由配置信息
- * 
+ *
  * @author ruoyi
  */
 @JsonInclude(JsonInclude.Include.NON_EMPTY)

aidex-system/src/main/java/com/aidex/system/mapper/SysAlarmMapper.java

@@ -0,0 +1,24 @@
+package com.aidex.system.mapper;
+
+import com.aidex.common.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.aidex.system.domain.SysAlarm;
+
+/**
+ * 报警信息Mapper接口
+ * @author ChenSir
+ * @email 914769835
+ * @date 2024-03-17
+ */
+public interface SysAlarmMapper extends BaseMapper<SysAlarm>
+{
+
+    /**
+     * 批量删除报警信息
+     * @param ids 需要删除的报警信息ID集合
+     * @return
+     */
+    public int deleteSysAlarmByIds(@Param("ids") String[] ids, @Param("DEL_FLAG_DELETE") String DEL_FLAG_DELETE);
+
+
+}

aidex-system/src/main/java/com/aidex/system/mapper/SysAlarmMapper.xml

@@ -0,0 +1,260 @@
+<?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.aidex.system.mapper.SysAlarmMapper">
+
+    <sql id="sysAlarmColumns">
+        a.object_id as "objectId",
+
+        a.mac_id as "macId",
+
+        a.full_name as "fullName",
+
+        a.mac_name as "macName",
+
+        a.alarmime as "alarmime",
+
+        a.addtime as "addtime",
+
+        a.speed as "speed",
+
+        a.lat as "lat",
+
+        a.lon as "lon",
+
+        a.dir as "dir",
+
+        a.describe as "describe",
+
+        a.alarm_type as "alarmType",
+
+        a.classify as "classify",
+
+        a.status as "status",
+
+        a.remark as "remark",
+
+        a.id as "id",
+
+        a.create_by as "createBy",
+
+        a.create_dept as "createDept",
+
+        a.create_time as "createTime",
+
+        a.update_by as "updateBy",
+
+        a.update_time as "updateTime",
+
+        a.update_ip as "updateIp",
+
+        a.version as "version",
+
+        a.del_flag as "delFlag"
+
+    </sql>
+
+    <sql id="sysAlarmJoins">
+    </sql>
+
+    <select id="get" resultType="SysAlarm">
+        SELECT
+            <include refid="sysAlarmColumns"/>
+        FROM sys_alarm a
+        <include refid="sysAlarmJoins"/>
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="SysAlarm">
+        SELECT
+            <include refid="sysAlarmColumns"/>
+        FROM sys_alarm a
+        <include refid="sysAlarmJoins"/>
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            <if test="objectId != null and objectId != ''">
+                AND a.object_id = #{objectId}
+            </if>
+            <if test="macId != null and macId != ''">
+                AND a.mac_id = #{macId}
+            </if>
+            <if test="fullName != null and fullName != ''">
+                and a.full_name like concat('%', #{fullName}, '%')
+            </if>
+            <if test="macName != null and macName != ''">
+                and a.mac_name like concat('%', #{macName}, '%')
+            </if>
+        </where>
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="findListWithUnique" resultType="SysAlarm">
+        SELECT
+            a.id
+        FROM sys_alarm a
+        <include refid="sysAlarmJoins"/>
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            <if test="notEqualId != null and notEqualId != ''">
+                AND id != #{notEqualId}
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insert">
+        INSERT INTO sys_alarm(
+
+            object_id,
+
+            mac_id,
+
+            full_name,
+
+            mac_name,
+
+            alarmime,
+
+            addtime,
+
+            speed,
+
+            lat,
+
+            lon,
+
+            dir,
+
+            `describe`,
+
+            alarm_type,
+
+            classify,
+
+            `status`,
+
+            remark,
+
+            id,
+
+            create_by,
+
+            create_dept,
+
+            create_time,
+
+            update_by,
+
+            update_time,
+
+            update_ip,
+
+            version,
+
+            del_flag
+
+        ) VALUES (
+
+            #{objectId},
+
+            #{macId},
+
+            #{fullName},
+
+            #{macName},
+
+            #{alarmime},
+
+            #{addtime},
+
+            #{speed},
+
+            #{lat},
+
+            #{lon},
+
+            #{dir},
+
+            #{describe},
+
+            #{alarmType},
+
+            #{classify},
+
+            #{status},
+
+            #{remark},
+
+            #{id},
+
+            #{createBy},
+
+            #{createDept},
+
+            #{createTime},
+
+            #{updateBy},
+
+            #{updateTime},
+
+            #{updateIp},
+
+            #{version},
+
+            #{delFlag}
+
+        )
+    </insert>
+
+    <update id="update">
+        UPDATE sys_alarm SET
+            object_id = #{objectId},
+            mac_id = #{macId},
+            full_name = #{fullName},
+            mac_name = #{macName},
+            alarmime = #{alarmime},
+            addtime = #{addtime},
+            speed = #{speed},
+            lat = #{lat},
+            lon = #{lon},
+            dir = #{dir},
+            `describe` = #{describe},
+            alarm_type = #{alarmType},
+            classify = #{classify},
+            `status` = #{status},
+            remark = #{remark},
+            update_by = #{updateBy},
+            update_time = #{updateTime},
+            update_ip = #{updateIp},
+            version = version + 1
+        WHERE id = #{id} and version = #{version}
+    </update>
+
+    <update id="updateStatus">
+        UPDATE sys_alarm SET
+            status = #{status},
+            version = version + 1
+        WHERE id = #{id}
+    </update>
+
+    <update id="delete">
+        UPDATE sys_alarm SET
+            del_flag = #{DEL_FLAG_DELETE}
+        WHERE id = #{id}
+    </update>
+
+    <delete id="deleteSysAlarmByIds">
+        UPDATE sys_alarm SET
+            del_flag = #{DEL_FLAG_DELETE}
+        WHERE id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysCommonUseMenuMapper.java

@@ -2,7 +2,6 @@ package com.aidex.system.mapper;
 
 import com.aidex.common.core.mapper.BaseMapper;
 import com.aidex.system.domain.SysCommonUseMenu;
-import com.aidex.system.domain.SysUserRole;
 
 import java.util.List;
 

aidex-system/src/main/java/com/aidex/system/mapper/SysCommonUseMenuMapper.xml

@@ -158,4 +158,4 @@
             where id = #{item.id}
         </foreach>
     </update>
-</mapper>
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysConfigMapper.java

@@ -8,14 +8,14 @@ import java.util.List;
 
 /**
  * 参数配置 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysConfigMapper extends BaseMapper<SysConfig>
 {
     /**
      * 批量删除参数信息
-     * 
+     *
      * @param configIds 需要删除的参数ID
      * @return 结果。
      */

aidex-system/src/main/java/com/aidex/system/mapper/SysConfigMapper.xml

@@ -157,5 +157,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{ids}
 		</foreach>
 	</update>
-    
-</mapper>
+
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysDeptMapper.xml

@@ -262,22 +262,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="checkDeptExistUser"  resultType="int">
 		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
 	</select>
-	
+
 	<select id="hasChildByDeptId"  resultType="int">
 		select count(1) from sys_dept
 		where del_flag = '0' and parent_id = #{PARENT}
 	</select>
-	
+
 	<select id="selectChildrenDeptById"  resultType="SysDept">
 		select * from sys_dept t
 		where  t.parent_ids like CONCAT(#{parentIds},'%')
 	</select>
-	
+
 	<select id="selectNormalChildByParentIds" resultType="int">
 		select count(id) from sys_dept t where t.status = 0 and t.del_flag = '0'
 		and t.parent_ids like concat(#{parentIds},'%') and t.parent_ids &lt;&gt; #{parentIds}
 	</select>
-	
+
 	<select id="checkDeptNameUnique" resultType="SysDept">
 		SELECT
 		<include refid="deptColumns"/>
@@ -307,7 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{item.id}
 		</foreach>
 	</update>
-	 
+
 	 <update id="updateDeptStatus">
  	    update sys_dept
  	    <set>
@@ -491,4 +491,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		FROM sys_dept t
 		where t.dept_code = #{deptCode} and t.del_flag = #{DEL_FLAG_NORMAL}
 	</select>
-</mapper>
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysDictDataMapper.java

@@ -4,11 +4,9 @@ import com.aidex.common.core.mapper.BaseMapper;
 import com.aidex.system.domain.SysDictData;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * 字典表 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysDictDataMapper extends BaseMapper<SysDictData>
@@ -16,7 +14,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
 
     /**
      * 批量删除字典数据信息
-     * 
+     *
      * @param dictDataIds 需要删除的字典数据ID
      * @return 结果
      */
@@ -24,7 +22,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
 
     /**
      * 同步修改字典类型
-     * 
+     *
      * @param oldDictType 旧字典类型
      * @param newDictType 新旧字典类型
      * @return 结果

aidex-system/src/main/java/com/aidex/system/mapper/SysDictDataMapper.xml

@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{ids}
 		</foreach>
  	</update>
-	
+
 	<update id="update" parameterType="SysDictData">
  		update sys_dict_data
  		<set>
@@ -128,11 +128,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where id = #{id}
 	</update>
-	
+
 	<update id="updateDictDataType" parameterType="String">
  		update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
 	</update>
- 	
+
  	<insert id="insert" parameterType="SysDictData">
  		insert into sys_dict_data(
  			id,
@@ -187,4 +187,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
 		and a.dict_type = #{dictType}
 	</select>
-</mapper> 
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysDictTypeMapper.java

@@ -2,21 +2,20 @@ package com.aidex.system.mapper;
 
 import com.aidex.common.core.mapper.BaseMapper;
 import com.aidex.system.domain.SysDictType;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
  * 字典表 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
 
     /**
      * 批量删除字典类型信息
-     * 
+     *
      * @param dictTypeIds 需要删除的字典ID
      * @return 结果
      */
@@ -24,7 +23,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
 
     /**
      * 校验字典类型称是否唯一
-     * 
+     *
      * @param dictType 字典类型
      * @return 结果
      */

aidex-system/src/main/java/com/aidex/system/mapper/SysDictTypeMapper.xml

@@ -144,4 +144,4 @@
  		)
 	</insert>
 
-</mapper>
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysLoginLogMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 系统访问日志情况信息 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysLoginLogMapper extends BaseMapper<SysLoginLog>
@@ -14,7 +14,7 @@ public interface SysLoginLogMapper extends BaseMapper<SysLoginLog>
 
     /**
      * 批量删除系统登录日志
-     * 
+     *
      * @param infoIds 需要删除的登录日志ID
      * @return 结果
      */
@@ -22,7 +22,7 @@ public interface SysLoginLogMapper extends BaseMapper<SysLoginLog>
 
     /**
      * 清空系统登录日志
-     * 
+     *
      * @return 结果
      */
     public int cleanLoginLog();

aidex-system/src/main/java/com/aidex/system/mapper/SysLoginLogMapper.xml

@@ -125,4 +125,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="deleteLoginLogBySaveDay" parameterType="java.lang.String">
 		delete from  sys_login_log where  datediff(SYSDATE(),login_time) >= #{saveDay}
 	</update>
-</mapper> 
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysMenuMapper.xml

@@ -384,4 +384,4 @@
 		</foreach>
 	</delete>
 
-</mapper> 
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysNoticeMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * 通知公告表 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysNoticeMapper extends BaseMapper<SysNotice>
@@ -16,7 +16,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice>
 
     /**
      * 批量删除公告信息
-     * 
+     *
      * @param noticeIds 需要删除的公告ID
      * @return 结果
      */

aidex-system/src/main/java/com/aidex/system/mapper/SysNoticeMapper.xml

@@ -16,7 +16,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		a.update_time AS "updateTime",
 		a.update_ip AS "updateIp",
 		a.remark AS "remark",
-		a.version AS "version"
+		a.version AS "version",
+        a.topping AS "topping",
+        a.carousel_img_url AS "carouselImgUrl",
+        a.carousel AS "carousel"
 	</sql>
 
     <sql id="sysNoticeJoins">
@@ -24,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="sysNoticeOrderBy">
-			order by a.create_time desc
+			order by topping desc, a.create_time desc
 	</sql>
 
     <select id="get" resultType="SysNotice">
@@ -63,6 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			notice_content,
 			notice_content_html,
 			status,
+            topping,
+            carousel,
+            carousel_img_url,
 			remark,
  			create_by,
 			create_dept,
@@ -79,6 +85,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{noticeContent},
 			#{noticeContentHtml},
 			#{status},
+            #{topping},
+            #{carousel},
+            #{carouselImgUrl},
 			#{remark},
  			#{createBy},
 			#{createDept},
@@ -90,9 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			1
 		)
     </insert>
-	 
+
     <update id="update" parameterType="SysNotice">
-        update sys_notice 
+        update sys_notice
         <set>
             <if test="noticeTitle != null and noticeTitle != ''">
                 notice_title = #{noticeTitle},
@@ -100,6 +109,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="noticeType != null and noticeType != ''">
                 notice_type = #{noticeType},
             </if>
+            <if test="topping != null and topping != ''">
+                topping = #{topping},
+            </if>
+            <if test="carousel != null and carousel != ''">
+                carousel = #{carousel},
+            </if>
+            <if test="carouselImgUrl != null and carouselImgUrl != ''">
+                carousel_img_url = #{carouselImgUrl},
+            </if>
             <if test="noticeContent != null">
                 notice_content = #{noticeContent},
             </if>
@@ -180,5 +198,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <include refid="sysNoticeOrderBy"/>
     </select>
-    
-</mapper>
+
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysNoticeUserReadMapper.xml

@@ -136,4 +136,4 @@
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysOperLogMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 操作日志 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysOperLogMapper extends BaseMapper<SysOperLog>
@@ -15,7 +15,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog>
 
     /**
      * 批量删除系统操作日志
-     * 
+     *
      * @param operIds 需要删除的操作日志ID
      * @return 结果
      */

aidex-system/src/main/java/com/aidex/system/mapper/SysOperLogMapper.xml

@@ -170,11 +170,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{ids}
 		</foreach>
 	</update>
-	
+
 	<update id="cleanOperLog">
         truncate table sys_oper_log
     </update>
 	<update id="deleteOperLogBySaveDay" parameterType="java.lang.String">
 		delete from  sys_oper_log where  datediff(SYSDATE(),oper_time) >= #{saveDay}
 	</update>
-</mapper> 
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysPortalConfigMapper.xml

@@ -292,4 +292,4 @@
         ORDER BY
         a.create_time
     </select>
-</mapper>
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysPortletMapper.xml

@@ -227,4 +227,4 @@
             </otherwise>
         </choose>
     </select>
-</mapper>
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysPostMapper.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * 岗位信息 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysPostMapper extends BaseMapper<SysPost>
@@ -15,7 +15,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
 
     /**
      * 根据用户ID获取岗位选择框列表
-     * 
+     *
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
@@ -23,7 +23,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
 
     /**
      * 查询用户所属岗位组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -31,7 +31,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
 
     /**
      * 批量删除岗位信息
-     * 
+     *
      * @param postIds 需要删除的岗位ID
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
 
     /**
      * 唯一性校验判断
-     * 
+     *
      * @param sysPost 岗位名称
      * @return 结果
      */

aidex-system/src/main/java/com/aidex/system/mapper/SysPostMapper.xml

@@ -159,4 +159,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE status = #{DEL_FLAG_NORMAL}
 	</select>
 
-</mapper> 
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysRoleDeptMapper.java

@@ -5,14 +5,14 @@ import com.aidex.system.domain.SysRoleDept;
 
 /**
  * 角色与部门关联表 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysRoleDeptMapper
 {
     /**
      * 通过角色ID删除角色和部门关联
-     * 
+     *
      * @param roleId 角色ID
      * @return 结果
      */
@@ -20,7 +20,7 @@ public interface SysRoleDeptMapper
 
     /**
      * 批量删除角色部门关联信息
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -28,7 +28,7 @@ public interface SysRoleDeptMapper
 
     /**
      * 查询部门使用数量
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
@@ -36,7 +36,7 @@ public interface SysRoleDeptMapper
 
     /**
      * 批量新增角色部门信息
-     * 
+     *
      * @param roleDeptList 角色部门列表
      * @return 结果
      */

aidex-system/src/main/java/com/aidex/system/mapper/SysRoleDeptMapper.xml

@@ -12,23 +12,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<delete id="deleteRoleDeptByRoleId" parameterType="String">
 		delete from sys_role_dept where role_id=#{roleId}
 	</delete>
-	
+
 	<select id="selectCountRoleDeptByDeptId" resultType="Integer">
 	    select count(1) from sys_role_dept where dept_id=#{deptId}
 	</select>
-	
+
 	<delete id="deleteRoleDept" parameterType="Long">
  		delete from sys_role_dept where role_id in
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{roleId}
-        </foreach> 
+        </foreach>
  	</delete>
-	
+
 	<insert id="batchRoleDept">
 		insert into sys_role_dept(role_id, dept_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.roleId},#{item.deptId})
 		</foreach>
 	</insert>
-	
-</mapper> 
+
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysRoleMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * 角色表 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysRoleMapper extends BaseMapper<SysRole>
@@ -16,7 +16,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
 
     /**
      * 根据用户ID查询角色
-     * 
+     *
      * @param userId 用户ID
      * @return 角色列表
      */
@@ -24,14 +24,14 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
 
     /**
      * 查询所有角色
-     * 
+     *
      * @return 角色列表
      */
     public List<SysRole> selectRoleAll();
 
     /**
      * 根据用户ID获取角色选择框列表
-     * 
+     *
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
@@ -40,7 +40,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
 
     /**
      * 根据用户ID查询角色
-     * 
+     *
      * @param userName 用户名
      * @return 角色列表
      */
@@ -57,7 +57,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
 
     /**
      * 批量删除角色信息
-     * 
+     *
      * @param roleIds 需要删除的角色ID
      * @return 结果
      */

aidex-system/src/main/java/com/aidex/system/mapper/SysRoleMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_user u on u.id = ur.user_id
 	        left join sys_dept d on u.dept_id = d.id
     </sql>
-    
+
     <select id="findList" resultType="SysRole">
 		<include refid="selectRoleVo"/>
 		where t.del_flag = #{DEL_FLAG_NORMAL}
@@ -58,16 +58,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		order by t.sort, t.create_time
 	</select>
-    
+
 	<select id="selectRolePermissionByUserId" parameterType="String" resultType="SysRole">
 		<include refid="selectRoleVo"/>
 		WHERE t.del_flag = #{DEL_FLAG_NORMAL} and ur.user_id = #{userId}
 	</select>
-	
+
 	<select id="selectRoleAll" resultType="SysRole">
 		<include refid="selectRoleVo"/>
 	</select>
-	
+
 	<select id="selectRoleListByUserId" parameterType="String" resultType="String">
 		select t.id
         from sys_role t
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_user u on u.id = ur.user_id
 	    where u.id = #{userId}
 	</select>
-	
+
 	<select id="get" resultType="SysRole">
 		<include refid="selectRoleVo"/>
 		where t.id =  #{id}
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectRoleVo"/>
 		WHERE t.del_flag = #{DEL_FLAG_NORMAL} and u.user_name = #{userName}
 	</select>
-	
+
 	<select id="findListWithUnique" resultType="SysRole">
 		SELECT
 			1
@@ -159,11 +159,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</set>
 		where id = #{id}  and version = #{version}
 	</update>
-	
+
 	<update id="updateRoleStatus" parameterType="SysRole">
  		update sys_user set status = #{status} where id = #{userId}
 	</update>
-	
+
 
 	<delete id="delete">
 		UPDATE sys_role SET
@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	    update sys_role set del_flag = '1' where id in
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{roleId}
-        </foreach> 
+        </foreach>
  	</delete>
 
 	<select id="findMaxSort" resultType="Integer">
@@ -187,4 +187,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<delete id="deleteRoleById" parameterType="String">
 		update sys_role set del_flag = '1' where id = #{roleId}
 	</delete>
-</mapper> 
+</mapper>

aidex-system/src/main/java/com/aidex/system/mapper/SysRoleMenuMapper.java

@@ -2,18 +2,17 @@ package com.aidex.system.mapper;
 
 import java.util.List;
 import com.aidex.system.domain.SysRoleMenu;
-import io.lettuce.core.dynamic.annotation.Param;
 
 /**
  * 角色与菜单关联表 数据层
- * 
+ *
  * @author ruoyi
  */
 public interface SysRoleMenuMapper
 {
     /**
      * 查询菜单使用数量
-     * 
+     *
      * @param menuId 菜单ID
      * @return 结果
      */
@@ -21,7 +20,7 @@ public interface SysRoleMenuMapper
 
     /**
      * 通过角色ID删除角色和菜单关联
-     * 
+     *
      * @param roleId 角色ID
      * @return 结果
      */
@@ -29,7 +28,7 @@ public interface SysRoleMenuMapper
 
     /**
      * 批量删除角色菜单关联信息
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -37,7 +36,7 @@ public interface SysRoleMenuMapper
 
     /**
      * 批量新增角色菜单信息
-     * 
+     *
      * @param roleMenuList 角色菜单列表
      * @return 结果
      */