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

.idea/compiler.xml

@@ -7,10 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="base-admin" />
+        <module name="hazard-admin" />
         <module name="hazard-sdk" />
         <module name="business-service" />
-        <module name="hazard-admin" />
-        <module name="base-admin" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>

business-service/src/main/java/com/ozs/service/entity/UserRegistrationid.java

@@ -0,0 +1,21 @@
+package com.ozs.service.entity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author : sunhh
+ * @create 2023/3/14 17:02
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("用户RegistrationID表")
+public class UserRegistrationid {
+    private String userId;
+    private String registrationId;
+}

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

@@ -15,6 +15,10 @@ import java.util.Date;
 @Data
 public class MsgAppPushVo extends PageVo implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 主键id
+     */
+    private String id;
 
     /**
      * 报警唯一标识

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

@@ -0,0 +1,17 @@
+package com.ozs.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.service.entity.SvcAddress;
+import com.ozs.service.entity.UserRegistrationid;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author : sunhh
+ * @create 2023/3/14 17:10
+ */
+@Mapper
+public interface UserRegistrationidMapper extends BaseMapper<UserRegistrationid> {
+    int updateRegistrationID(UserRegistrationid userRegistrationid);
+
+    int addRegistrationID(UserRegistrationid userRegistrationid);
+}

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

@@ -0,0 +1,12 @@
+package com.ozs.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.service.entity.UserRegistrationid;
+
+/**
+ * @Author : sunhh
+ * @create 2023/3/14 17:07
+ */
+public interface UserRegistrationidService extends IService<UserRegistrationid> {
+    Integer addRegistrationID(UserRegistrationid userRegistrationid);
+}

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

@@ -0,0 +1,38 @@
+package com.ozs.service.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+
+/**
+ * @Author : sunhh
+ * @create 2023/3/14 17:08
+ */
+@Service
+public class UserRegistrationidServiceImpl extends ServiceImpl<UserRegistrationidMapper, UserRegistrationid> implements UserRegistrationidService {
+    @Autowired
+    private UserRegistrationidMapper userRegistrationidMapper;
+
+    @Override
+    public Integer addRegistrationID(UserRegistrationid userRegistrationid) {
+        LambdaQueryWrapper<UserRegistrationid> lw = new LambdaQueryWrapper<UserRegistrationid>();
+        if (!ObjectUtils.isEmpty(userRegistrationid.getUserId())) {
+            lw.in(UserRegistrationid::getUserId, userRegistrationid.getUserId());
+        }
+        List<UserRegistrationid> userRegistrationids = userRegistrationidMapper.selectList(lw);
+        int add = 0;
+        if (userRegistrationids.size() > 0) {
+            add = userRegistrationidMapper.updateRegistrationID(userRegistrationid);
+        } else {
+            add = userRegistrationidMapper.insert(userRegistrationid);
+        }
+        return add;
+    }
+}

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

@@ -29,6 +29,7 @@
     </resultMap>
     <select id="alarmPushMsg" resultMap="MsgAppPushVoResult">
         select
+        m.id,
         m.alarm_id,
         m.receive_by,
         a.line_dir AS lineDir,

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

@@ -0,0 +1,14 @@
+<?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.ozs.service.mapper.UserRegistrationidMapper">
+
+    <update id="updateRegistrationID" parameterType="com.ozs.service.entity.UserRegistrationid">
+        update user_registrationid
+        <set>
+            <if test="registrationId != null and registrationId != ''">
+                registration_id = #{registrationId}
+            </if>
+        </set>
+        where user_id = #{userId}
+    </update>
+</mapper>

hazard-admin/src/main/java/com/ozs/web/controller/app/GeoHazardMineController.java

@@ -107,7 +107,7 @@ public class GeoHazardMineController extends BaseController {
      * app推送报警信息记录修改状态
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    @ApiOperation("app推送报警信息记录分页显示（全部信息）")
+    @ApiOperation("app推送报警信息记录修改状态")
     public AjaxResult update(@RequestBody MsgAppPush msgAppPush) {
         String userName = getUsername();
         msgAppPushService.update(msgAppPush.getId(), msgAppPush.getStatus(), userName);

hazard-admin/src/main/java/com/ozs/web/controller/app/JPushAppController.java

@@ -0,0 +1,39 @@
+package com.ozs.web.controller.app;
+
+import com.ozs.common.core.controller.BaseController;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.service.entity.UserRegistrationid;
+import com.ozs.service.service.UserRegistrationidService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @Author : sunhh
+ * @create 2023/3/14 16:36
+ */
+@Slf4j
+@RestController
+@RequestMapping("/jPushApp")
+public class JPushAppController extends BaseController {
+    @Autowired
+    private UserRegistrationidService userRegistrationidService;
+
+    /**
+     * 存储RegistrationID
+     */
+    @PostMapping("/addRegistrationID")
+    @ApiOperation("存储RegistrationID")
+    public AjaxResult addRegistrationID(@RequestBody UserRegistrationid userRegistrationid) {
+        if (StringUtils.isBlank(userRegistrationid.getUserId()) || StringUtils.isBlank(userRegistrationid.getRegistrationId())) {
+            return AjaxResult.error("userId,RegistrationID 不能为空！");
+        }
+        return toAjax(userRegistrationidService.addRegistrationID(userRegistrationid));
+    }
+}

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

@@ -3,8 +3,15 @@ package com.ozs.web.controller.system;
 import java.util.ArrayList;
 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.SysDictDataVo;
+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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,28 +39,67 @@ import com.ozs.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
-{
+public class SysDictDataController extends BaseController {
     @Autowired
     private ISysDictDataService dictDataService;
 
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
-    {
-        startPage();
-        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        return getDataTable(list);
+//    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(SysDictData dictData)
+//    {
+//        startPage();
+//        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+//        return getDataTable(list);
+//    }
+
+    /**
+     * 获取字典数据列表
+     *
+     * @param sysDictDataVo
+     * @return
+     */
+    @ApiOperation(value = "获取字典类型列表")
+    @PostMapping("/list")
+    public AjaxResult list(@RequestBody SysDictDataVo sysDictDataVo) {
+        LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<SysDictData>();
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictCode())) {
+            wrapper.like(SysDictData::getDictCode, sysDictDataVo.getDictCode());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictSort())) {
+            wrapper.like(SysDictData::getDictSort, sysDictDataVo.getDictSort());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictLabel())) {
+            wrapper.like(SysDictData::getDictLabel, sysDictDataVo.getDictLabel());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictValue())) {
+            wrapper.like(SysDictData::getDictValue, sysDictDataVo.getDictValue());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getDictType())) {
+            wrapper.like(SysDictData::getDictType, sysDictDataVo.getDictType());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getCssClass())) {
+            wrapper.like(SysDictData::getCssClass, sysDictDataVo.getCssClass());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getListClass())) {
+            wrapper.like(SysDictData::getListClass, sysDictDataVo.getListClass());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getIsDefault())) {
+            wrapper.like(SysDictData::getIsDefault, sysDictDataVo.getIsDefault());
+        }
+        if (!ObjectUtils.isEmpty(sysDictDataVo.getStatus())) {
+            wrapper.like(SysDictData::getStatus, sysDictDataVo.getStatus());
+        }
+        IPage<SysDictData> page = dictDataService.page(new Page<>(sysDictDataVo.getPageNum(), sysDictDataVo.getPageSize()), wrapper);
+        return AjaxResult.success(page);
     }
 
     @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, 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

@@ -1,9 +1,21 @@
 package com.ozs.web.controller.system;
 
 import java.util.List;
+import java.util.stream.Collectors;
 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.entity.SysDept;
+import com.ozs.common.core.domain.entity.SysRole;
+import com.ozs.common.core.domain.entity.SysUser;
+import com.ozs.common.core.domain.vo.SysDictTypeVo;
+import com.ozs.common.core.domain.vo.SysUserVo;
+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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,25 +42,52 @@ import com.ozs.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/type")
-public class SysDictTypeController extends BaseController
-{
+public class SysDictTypeController extends BaseController {
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysDictType dictType)
-    {
-        startPage();
-        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        return getDataTable(list);
+//    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(SysDictType dictType)
+//    {
+//        startPage();
+//        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+//        return getDataTable(list);
+//    }
+
+    /**
+     * 获取字典类型列表
+     *
+     * @param sysDictTypeVo
+     * @return
+     */
+    @ApiOperation(value = "获取字典类型列表")
+    @PostMapping("/list")
+    public AjaxResult list(@RequestBody SysDictTypeVo sysDictTypeVo) {
+        LambdaQueryWrapper<SysDictType> wrapper = new LambdaQueryWrapper<SysDictType>();
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getDictId())) {
+            wrapper.like(SysDictType::getDictId, sysDictTypeVo.getDictId());
+        }
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getDataType())) {
+            wrapper.like(SysDictType::getDataType, sysDictTypeVo.getDataType());
+        }
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getDictName())) {
+            wrapper.like(SysDictType::getDictName, sysDictTypeVo.getDictName());
+        }
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getDictType())) {
+            wrapper.like(SysDictType::getDictType, sysDictTypeVo.getDictType());
+        }
+        if (!ObjectUtils.isEmpty(sysDictTypeVo.getStatus())) {
+            wrapper.like(SysDictType::getStatus, sysDictTypeVo.getStatus());
+        }
+        IPage<SysDictType> page = dictTypeService.page(new Page<>(sysDictTypeVo.getPageNum(), sysDictTypeVo.getPageSize()), wrapper);
+        return AjaxResult.success(page);
     }
 
     @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, SysDictType dictType) {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
         util.exportExcel(response, list, "字典类型");