Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

business-service/src/main/java/com/ozs/entity/vo/AlarmStatisticDto.java

@@ -70,9 +70,14 @@ public class AlarmStatisticDto {
     /**
      * 框定范围
      */
-    @Excel(name = "框定范围")
     private String alarmAttr;
 
+    /**
+     * 报警病害属性（可以给出泥石流的框定范围）字符串
+     */
+    @Excel(name = "报警病害属性")
+    private String alarmAttrString;
+
     /**
      * 报警是否解除 1已解除2未解除
      */

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/DataStatisticController.java

@@ -292,6 +292,13 @@ public class DataStatisticController extends BaseController {
                     if (!ObjectUtils.isEmpty(l.getIsRelease())) {
                         l.setIsReleaseName(l.getIsRelease() == 1 ? "已解除" : "未解除");
                     }
+                    if (!ObjectUtils.isEmpty(l.getAlarmAttr())) {
+                        String[] split1 = l.getAlarmAttr().split(",");
+                        String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
+                                "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
+                                "大小" + split1[4] + "×" + split1[5];
+                        l.setAlarmAttrString(stringBuilder);
+                    }
                 });
             }
 

vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysLoginInfoController.java

@@ -1,25 +1,31 @@
 package com.ozs.web.controller.monitor;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.ozs.common.core.domain.vo.SysLoginInfoResq;
+import com.ozs.common.core.domain.vo.SysLoginInfoVo;
+import com.ozs.common.utils.StringUtils;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.vo.SysLoginInfoVo;
+import com.ozs.common.core.page.TableDataInfo;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.SysPasswordService;
 import com.ozs.system.domain.SysLoginInfo;
 import com.ozs.system.service.ISysLoginInfoService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 系统访问记录
@@ -52,8 +58,9 @@ public class SysLoginInfoController extends BaseController {
     @ApiOperation(value = "获取登录日志分页列表")
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
-    public AjaxResult list(@RequestBody SysLoginInfoVo sysLoginInfoVo) {
+    public AjaxResult list(@RequestBody SysLoginInfoVo sysLoginInfoVo) throws ParseException {
         LambdaQueryWrapper<SysLoginInfo> wrapper = new LambdaQueryWrapper<SysLoginInfo>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (!ObjectUtils.isEmpty(sysLoginInfoVo.getIpaddr())) {
             wrapper.like(SysLoginInfo::getIpaddr, sysLoginInfoVo.getIpaddr());
         }
@@ -61,18 +68,15 @@ public class SysLoginInfoController extends BaseController {
             wrapper.like(SysLoginInfo::getUserName, sysLoginInfoVo.getUserName());
         }
         if (!ObjectUtils.isEmpty(sysLoginInfoVo.getStatus())) {
-            wrapper.like(SysLoginInfo::getStatus, sysLoginInfoVo.getStatus());
-        }
-        if (!ObjectUtils.isEmpty(sysLoginInfoVo.getLoginTime())) {
-            wrapper.like(SysLoginInfo::getLoginTime, sysLoginInfoVo.getLoginTime());
+            wrapper.eq(SysLoginInfo::getStatus, sysLoginInfoVo.getStatus());
         }
         if (!ObjectUtils.isEmpty(sysLoginInfoVo.getStartTime())) {
-            wrapper.ge(SysLoginInfo::getLoginTime, sysLoginInfoVo.getStartTime());
+            wrapper.apply(StringUtils.isNotBlank(sysLoginInfoVo.getStartTime()), "date_format(login_time,'%y%m%d') >= date_format('" + sysLoginInfoVo.getStartTime() + "','%y%m%d')");
         }
         if (!ObjectUtils.isEmpty(sysLoginInfoVo.getEndTime())) {
-            wrapper.le(SysLoginInfo::getLoginTime, sysLoginInfoVo.getEndTime());
+            wrapper.apply(StringUtils.isNotBlank(sysLoginInfoVo.getEndTime()), "date_format(login_time,'%y%m%d') <= date_format('" + sysLoginInfoVo.getEndTime() + "','%y%m%d')");
         }
-            wrapper.orderByDesc(SysLoginInfo::getLoginTime);
+        wrapper.orderByDesc(SysLoginInfo::getLoginTime);
         IPage<SysLoginInfo> page = logininforService.page(new Page<>(sysLoginInfoVo.getPageNum(), sysLoginInfoVo.getPageSize()), wrapper);
         return AjaxResult.success(page);
     }
@@ -88,8 +92,8 @@ public class SysLoginInfoController extends BaseController {
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysLoginInfo logininfor) {
-        List<SysLoginInfo> list = logininforService.selectLogininforList(logininfor);
+    public void export(HttpServletResponse response, @RequestBody SysLoginInfoResq sysLoginInfoResq) {
+        List<SysLoginInfo> list = logininforService.selectLogininforList(sysLoginInfoResq);
         ExcelUtil<SysLoginInfo> util = new ExcelUtil<SysLoginInfo>(SysLoginInfo.class);
         util.exportExcel(response, list, "登录日志");
     }

vehicle-admin/src/main/java/com/ozs/web/controller/monitor/SysOperlogController.java

@@ -1,24 +1,31 @@
 package com.ozs.web.controller.monitor;
 
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.core.domain.vo.SysLoginInfoVo;
+import com.ozs.common.core.domain.vo.SysOperlogResq;
+import com.ozs.common.core.domain.vo.SysOperlogVo;
+import com.ozs.common.utils.DateUtils;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.system.domain.SysLoginInfo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.vo.SysOperlogVo;
+import com.ozs.common.core.page.TableDataInfo;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.domain.SysOperLog;
 import com.ozs.system.service.ISysOperLogService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 操作日志记录
@@ -51,9 +58,6 @@ public class SysOperlogController extends BaseController {
     @PostMapping("/list")
     public AjaxResult list(@RequestBody SysOperlogVo sysOperlogVo) {
         LambdaQueryWrapper<SysOperLog> wrapper = new LambdaQueryWrapper<SysOperLog>();
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getOperId())) {
-            wrapper.like(SysOperLog::getOperId, sysOperlogVo.getOperId());
-        }
         if (!ObjectUtils.isEmpty(sysOperlogVo.getUserId())) {
             wrapper.like(SysOperLog::getUserId, sysOperlogVo.getUserId());
         }
@@ -63,19 +67,16 @@ public class SysOperlogController extends BaseController {
         if (!ObjectUtils.isEmpty(sysOperlogVo.getTitle())) {
             wrapper.like(SysOperLog::getTitle, sysOperlogVo.getTitle());
         }
-        if (!ObjectUtils.isEmpty(sysOperlogVo.getOperTime())) {
-            wrapper.like(SysOperLog::getOperTime, sysOperlogVo.getOperTime());
-        }
         if (!ObjectUtils.isEmpty(sysOperlogVo.getStartTime())) {
-            wrapper.ge(SysOperLog::getOperTime, sysOperlogVo.getStartTime());
+            wrapper.apply(StringUtils.isNotBlank(sysOperlogVo.getStartTime()), "date_format(oper_time,'%y%m%d') >= date_format('" + sysOperlogVo.getStartTime() + "','%y%m%d')");
         }
         if (!ObjectUtils.isEmpty(sysOperlogVo.getEndTime())) {
-            wrapper.le(SysOperLog::getOperTime, sysOperlogVo.getEndTime());
+            wrapper.apply(StringUtils.isNotBlank(sysOperlogVo.getEndTime()), "date_format(oper_time,'%y%m%d') <= date_format('" + sysOperlogVo.getEndTime() + "','%y%m%d')");
         }
         if (!ObjectUtils.isEmpty(sysOperlogVo.getBusinessType())) {
             wrapper.eq(SysOperLog::getBusinessType, sysOperlogVo.getBusinessType());
         }
-            wrapper.orderByDesc(SysOperLog::getOperTime);
+        wrapper.orderByDesc(SysOperLog::getOperTime);
         IPage<SysOperLog> page = operLogService.page(new Page<>(sysOperlogVo.getPageNum(), sysOperlogVo.getPageSize()), wrapper);
         return AjaxResult.success(page);
     }
@@ -91,8 +92,8 @@ public class SysOperlogController extends BaseController {
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysOperLog operLog) {
-        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+    public void export(HttpServletResponse response, @RequestBody SysOperlogResq sysOperlogResq) {
+        List<SysOperLog> list = operLogService.selectOperLogList(sysOperlogResq);
         ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
         util.exportExcel(response, list, "操作日志");
     }