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

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

@@ -20,14 +20,14 @@ public class AlarmStatisticResVo extends PageVo implements Serializable {
     private String railwayCode;
 
     /**
-     * 起始月份
+     * 当前年份
      */
-    private Integer startMonth;
+    private Integer currentYear;
 
     /**
-     * 结束月份
+     * 当前月份
      */
-    private Integer endMonth;
+    private Integer currentMonth;
 
     /**
      * 灾害类型

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

@@ -25,16 +25,16 @@ import java.util.Map;
 @Mapper
 public interface MsgAlarmMapper extends BaseMapper<MsgAlarm> {
     //报警数据详情
-    List<AlarmStatisticVo> list(@Param("railwayCode") String railwayCode, @Param("startMonth") Integer startMonth, @Param("endMonth") Integer endMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+    List<AlarmStatisticVo> list(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
 
     //报警数据详情导出数据集合
-    List<AlarmStatisticDto> listDto(@Param("railwayCode") String railwayCode, @Param("startMonth") Integer startMonth, @Param("endMonth") Integer endMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+    List<AlarmStatisticDto> listDto(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
 
     //报警月统计数据
-    List<AlarmStatisticVo> listMonth(@Param("railwayCode") String railwayCode, @Param("startMonth") Integer startMonth, @Param("endMonth") Integer endMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+    List<AlarmStatisticVo> listMonth(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
 
     //报警月统计数据导出数据集合
-    List<AlarmStatisticMonthDto> listDtoMonth(@Param("railwayCode") String railwayCode, @Param("startMonth") Integer startMonth, @Param("endMonth") Integer endMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+    List<AlarmStatisticMonthDto> listDtoMonth(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
 
     Map selectCameraCode(@Param("cameraCode") String cameraCode);
 

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

@@ -23,10 +23,10 @@ import java.util.Map;
  */
 public interface MsgAlarmService extends IService<MsgAlarm> {
     //web数据统计 报警数据详情
-    IPage<AlarmStatisticVo> list(String railwayCode, Integer startMonth, Integer endMonth, String alarmType, Integer pageNum, Integer pageSize, String userId);
+    IPage<AlarmStatisticVo> list(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, Integer pageNum, Integer pageSize, String userId);
 
     //web数据统计 报警月统计数据
-    List<AlarmStatisticMonthDto> getCount(String railwayCode, Integer startMonth, Integer endMonth, String alarmType, String userId);
+    List<AlarmStatisticMonthDto> getCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId);
 
     //报警数据详情导出数据集合
     List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo, String userId);

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

@@ -51,8 +51,8 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
 
     //web数据统计 报警数据详情
     @Override
-    public IPage<AlarmStatisticVo> list(String railwayCode, Integer startMonth, Integer endMonth, String alarmType, Integer pageNum, Integer pageSize, String userId) {
-        List<AlarmStatisticVo> list = msgAlarmMapper.list(railwayCode, startMonth, endMonth, alarmType, userId);
+    public IPage<AlarmStatisticVo> list(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, Integer pageNum, Integer pageSize, String userId) {
+        List<AlarmStatisticVo> list = msgAlarmMapper.list(railwayCode, currentYear, currentMonth, alarmType, userId);
         if (!ObjectUtils.isEmpty(list)) {
             list.forEach(l -> {
                 l.setAlarmMile(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
@@ -63,22 +63,22 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     }
 
     @Override
-    public List<AlarmStatisticMonthDto> getCount(String railwayCode, Integer startMonth, Integer endMonth, String alarmType, String userId) {
-        List<AlarmStatisticMonthDto> list = msgAlarmMapper.listDtoMonth(railwayCode, startMonth, endMonth, alarmType, userId);
+    public List<AlarmStatisticMonthDto> getCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId) {
+        List<AlarmStatisticMonthDto> list = msgAlarmMapper.listDtoMonth(railwayCode, currentYear, currentMonth, alarmType, userId);
         return list;
     }
 
     @Override
     public List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo, String userId) {
-        List<AlarmStatisticDto> listDto = msgAlarmMapper.listDto(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getStartMonth(),
-                alarmStatisticResVo.getEndMonth(), alarmStatisticResVo.getAlarmType(), userId);
+        List<AlarmStatisticDto> listDto = msgAlarmMapper.listDto(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
+                alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
         return listDto;
     }
 
     @Override
     public List<AlarmStatisticMonthDto> exportExcelMonth(AlarmStatisticResVo alarmStatisticResVo, String userId) throws Exception {
-        List<AlarmStatisticMonthDto> listDto = msgAlarmMapper.listDtoMonth(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getStartMonth(),
-                alarmStatisticResVo.getEndMonth(), alarmStatisticResVo.getAlarmType(), userId);
+        List<AlarmStatisticMonthDto> listDto = msgAlarmMapper.listDtoMonth(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
+                alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
         return listDto;
     }
 

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

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.service.entity.UserRegistrationid;
 import com.ozs.service.mapper.UserRegistrationidMapper;
 import com.ozs.service.service.UserRegistrationidService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -15,6 +17,7 @@ import java.util.List;
  * @Author : sunhh
  * @create 2023/3/14 17:08
  */
+@Slf4j
 @Service
 public class UserRegistrationidServiceImpl extends ServiceImpl<UserRegistrationidMapper, UserRegistrationid> implements UserRegistrationidService {
     @Autowired
@@ -23,20 +26,18 @@ public class UserRegistrationidServiceImpl extends ServiceImpl<UserRegistrationi
     @Override
     public Integer addRegistrationID(UserRegistrationid userRegistrationid) {
         LambdaQueryWrapper<UserRegistrationid> lw = new LambdaQueryWrapper<UserRegistrationid>();
-//        if (!ObjectUtils.isEmpty(userRegistrationid.getUserId())) {
-//            lw.in(UserRegistrationid::getUserId, userRegistrationid.getUserId());
-//        }
+        if (!ObjectUtils.isEmpty(userRegistrationid.getUserId())) {
+            lw.in(UserRegistrationid::getUserId, userRegistrationid.getUserId());
+        }
         if (!ObjectUtils.isEmpty(userRegistrationid.getRegistrationId())) {
             lw.in(UserRegistrationid::getRegistrationId, userRegistrationid.getRegistrationId());
         }
         List<UserRegistrationid> userRegistrationids = userRegistrationidMapper.selectList(lw);
-        int add = 0;
-        if (userRegistrationids.size() > 0) {
-            add = userRegistrationidMapper.updateRegistrationID(userRegistrationid);
-        } else {
-            add = userRegistrationidMapper.insert(userRegistrationid);
+        log.info("userRegistrationids:--------" + userRegistrationid);
+        if (!com.ozs.common.utils.StringUtils.isEmpty(userRegistrationids) && userRegistrationids.size() == 0) {
+            userRegistrationidMapper.insert(userRegistrationid);
         }
-        return add;
+        return 1;
     }
 
     @Override

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

@@ -64,11 +64,14 @@
             <if test="railwayCode != null and railwayCode != ''">
                 and UPPER(b.railway_code) like UPPER(CONCAT('%',#{railwayCode},'%'))
             </if>
-            <if test="startMonth != null and startMonth != 0">
-                <![CDATA[and MONTH(a.alarm_time) >=#{startMonth}]]>
+            <if test="currentYear != null and currentYear != 0">
+                and YEAR(a.alarm_time) like UPPER(CONCAT('%',#{currentYear},'%'))
             </if>
-            <if test="endMonth != null and endMonth != 0">
-                <![CDATA[and MONTH(a.alarm_time) <=#{endMonth}]]>
+            <if test="currentYear == null or currentYear == ''">
+                and YEAR(a.alarm_time) = YEAR(SYSDATE())
+            </if>
+            <if test="currentMonth != null and currentMonth != 0">
+                and MONTH(a.alarm_time) =#{currentMonth}
             </if>
             <if test="alarmType != null and alarmType != ''">
                 and UPPER(a.alarm_type) like UPPER(CONCAT('%',#{alarmType},'%'))
@@ -76,7 +79,6 @@
             <if test="userId != null and userId != ''">
                 and UPPER(m.receive_by) like UPPER(CONCAT('%',#{userId},'%'))
             </if>
-            and YEAR(a.alarm_time) = YEAR(SYSDATE())
         </where>
         group by a.alarm_id
     </select>
@@ -114,11 +116,14 @@
             <if test="railwayCode != null and railwayCode != ''">
                 and UPPER(b.railway_code) like UPPER(CONCAT('%',#{railwayCode},'%'))
             </if>
-            <if test="startMonth != null and startMonth != 0">
-                <![CDATA[and MONTH(a.alarm_time) >=#{startMonth}]]>
+            <if test="currentYear != null and currentYear != 0">
+                and YEAR(a.alarm_time) like UPPER(CONCAT('%',#{currentYear},'%'))
+            </if>
+            <if test="currentYear == null or currentYear == ''">
+                and YEAR(a.alarm_time) = YEAR(SYSDATE())
             </if>
-            <if test="endMonth != null and endMonth != 0">
-                <![CDATA[and MONTH(a.alarm_time) <=#{endMonth}]]>
+            <if test="currentMonth != null and currentMonth != 0">
+                and MONTH(a.alarm_time) =#{currentMonth}
             </if>
             <if test="alarmType != null and alarmType != ''">
                 and UPPER(a.alarm_type) like UPPER(CONCAT('%',#{alarmType},'%'))
@@ -126,7 +131,6 @@
             <if test="userId != null and userId != ''">
                 and UPPER(m.receive_by) like UPPER(CONCAT('%',#{userId},'%'))
             </if>
-            and YEAR(a.alarm_time) = YEAR(SYSDATE())
         </where>
         group by a.alarm_id
     </select>
@@ -152,11 +156,14 @@
             <if test="railwayCode != null and railwayCode != ''">
                 and UPPER(b.railway_code) like UPPER(CONCAT('%',#{railwayCode},'%'))
             </if>
-            <if test="startMonth != null and startMonth != 0">
-                <![CDATA[and MONTH(a.alarm_time) >=#{startMonth}]]>
+            <if test="currentYear != null and currentYear != 0">
+                and YEAR(a.alarm_time) like UPPER(CONCAT('%',#{currentYear},'%'))
+            </if>
+            <if test="currentYear == null or currentYear == ''">
+                and YEAR(a.alarm_time) = YEAR(SYSDATE())
             </if>
-            <if test="endMonth != null and endMonth != 0">
-                <![CDATA[and MONTH(a.alarm_time) <=#{endMonth}]]>
+            <if test="currentMonth != null and currentMonth != 0">
+                and MONTH(a.alarm_time) =#{currentMonth}
             </if>
             <if test="alarmType != null and alarmType != ''">
                 and UPPER(a.alarm_type) like UPPER(CONCAT('%',#{alarmType},'%'))
@@ -164,7 +171,6 @@
             <if test="userId != null and userId != ''">
                 and UPPER(m.receive_by) like UPPER(CONCAT('%',#{userId},'%'))
             </if>
-            and YEAR(a.alarm_time) = YEAR(SYSDATE())
         </where>
         group by a.alarm_id,MONTH(a.alarm_time)) AS p
     </select>

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -330,8 +330,8 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation(value = "web数据统计 报警数据详情")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "startMonth", value = "起始月份"),
-            @ApiImplicitParam(paramType = "query", name = "endMonth", value = "结束月份"),
+            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
+            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份"),
             @ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
     })
     public AjaxResult dataStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
@@ -342,8 +342,8 @@ public class MsgAlarmController extends BaseController {
         if (user.isAdmin(user.getId())) {
             userId = "";
         }
-        IPage<AlarmStatisticVo> page = msgAlarmService.list(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getStartMonth(),
-                alarmStatisticResVo.getEndMonth(), alarmStatisticResVo.getAlarmType(), pageNum, pageSize, userId);
+        IPage<AlarmStatisticVo> page = msgAlarmService.list(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
+                alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), pageNum, pageSize, userId);
         return AjaxResult.success(page);
     }
 
@@ -358,8 +358,8 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation(value = "web数据统计 报警月统计数据")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "startMonth", value = "起始月份"),
-            @ApiImplicitParam(paramType = "query", name = "endMonth", value = "结束月份"),
+            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
+            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份"),
             @ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
     })
     public AjaxResult alarmMonthStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
@@ -369,8 +369,8 @@ public class MsgAlarmController extends BaseController {
         if (user.isAdmin(user.getId())) {
             userId = "";
         }
-        List<AlarmStatisticMonthDto> list = msgAlarmService.getCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getStartMonth(),
-                alarmStatisticResVo.getEndMonth(), alarmStatisticResVo.getAlarmType(), userId);
+        List<AlarmStatisticMonthDto> list = msgAlarmService.getCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
+                alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
         List<Integer> numbs = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12));
         List<Integer> list1 = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
@@ -411,8 +411,8 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation(value = "web数据统计-数据导出")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "startMonth", value = "起始月份"),
-            @ApiImplicitParam(paramType = "query", name = "endMonth", value = "结束月份"),
+            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
+            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份"),
             @ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
     })
     public void exportDataStatistic(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
@@ -455,8 +455,8 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation(value = "报警月统计数据导出")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
-            @ApiImplicitParam(paramType = "query", name = "startMonth", value = "起始月份"),
-            @ApiImplicitParam(paramType = "query", name = "endMonth", value = "结束月份"),
+            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
+            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份"),
             @ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
     })
     public void exportDataStatisticMonth(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {

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

@@ -73,6 +73,7 @@ public class SysLoginInfoController extends BaseController {
         if (!ObjectUtils.isEmpty(sysLoginInfoVo.getEndTime())) {
             wrapper.le(SysLoginInfo::getLoginTime, sysLoginInfoVo.getEndTime());
         }
+            wrapper.orderByDesc(SysLoginInfo::getLoginTime);
         IPage<SysLoginInfo> page = logininforService.page(new Page<>(sysLoginInfoVo.getPageNum(), sysLoginInfoVo.getPageSize()), wrapper);
         return AjaxResult.success(page);
     }

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

@@ -80,6 +80,7 @@ public class SysOperlogController extends BaseController {
         if (!ObjectUtils.isEmpty(sysOperlogVo.getBusinessType())) {
             wrapper.eq(SysOperLog::getBusinessType, sysOperlogVo.getBusinessType());
         }
+            wrapper.orderByDesc(SysOperLog::getOperTime);
         IPage<SysOperLog> page = operLogService.page(new Page<>(sysOperlogVo.getPageNum(), sysOperlogVo.getPageSize()), wrapper);
         return AjaxResult.success(page);
     }

hazard-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java

@@ -100,7 +100,7 @@ public class SysDictDataController extends BaseController {
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysDictData dictData) {
+    public void export(HttpServletResponse response, @RequestBody SysDictData dictData) {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
         util.exportExcel(response, list, "字典数据");

hazard-admin/src/main/java/com/ozs/web/controller/system/SysDictTypeController.java

@@ -88,7 +88,7 @@ public class SysDictTypeController extends BaseController {
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysDictType dictType) {
+    public void export(HttpServletResponse response, @RequestBody SysDictType dictType) {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
         util.exportExcel(response, list, "字典类型");