Merge branch '20230724_sun新增大屏接口' of sckj/mz-cloud into master

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WlfwYjbwController.java

@@ -1,31 +1,25 @@
 package com.ruoyi.system.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.system.validate.group.AddGroup;
 import com.ruoyi.system.domain.WlfwYjbw;
 import com.ruoyi.system.service.IWlfwYjbwService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.system.validate.group.AddGroup;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 为老服务监控硬件报文信息Controller
- * 
+ *
  * @author sun
  * @date 2023-07-24
  */
@@ -103,4 +97,10 @@ public class WlfwYjbwController extends BaseController
     {
         return toAjax(wlfwYjbwService.deleteWlfwYjbwByIds(ids));
     }
+
+    @GetMapping("/getAdv")
+    public AjaxResult getAdv(WlfwYjbw wlfwYjbw)
+    {
+        return AjaxResult.success(wlfwYjbwService.getAdc(wlfwYjbw));
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WlfwYjbwMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
-import com.ruoyi.system.domain.WlfwYjbw;
 import com.ruoyi.common.datascope.utils.BaseMapperPlus;
+import com.ruoyi.system.domain.WlfwYjbw;
+
+import java.util.List;
 
 /**
  * 为老服务监控硬件报文信息Mapper接口
- * 
+ *
  * @author sun
  * @date 2023-07-24
  */
 public interface WlfwYjbwMapper extends BaseMapperPlus<WlfwYjbw> {
 
+    public List<WlfwYjbw> getAdc(WlfwYjbw wlfwYjbw);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWlfwYjbwService.java

@@ -1,19 +1,20 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
 import com.ruoyi.system.domain.WlfwYjbw;
 
+import java.util.List;
+
 /**
  * 为老服务监控硬件报文信息Service接口
- * 
+ *
  * @author sun
  * @date 2023-07-24
  */
-public interface IWlfwYjbwService 
+public interface IWlfwYjbwService
 {
     /**
      * 查询为老服务监控硬件报文信息
-     * 
+     *
      * @param id 为老服务监控硬件报文信息主键
      * @return 为老服务监控硬件报文信息
      */
@@ -21,15 +22,17 @@ public interface IWlfwYjbwService
 
     /**
      * 查询为老服务监控硬件报文信息列表
-     * 
+     *
      * @param wlfwYjbw 为老服务监控硬件报文信息
      * @return 为老服务监控硬件报文信息集合
      */
     public List<WlfwYjbw> selectWlfwYjbwList(WlfwYjbw wlfwYjbw);
 
+    public List<WlfwYjbw> getAdc(WlfwYjbw wlfwYjbw);
+
     /**
      * 新增为老服务监控硬件报文信息
-     * 
+     *
      * @param wlfwYjbw 为老服务监控硬件报文信息
      * @return 结果
      */
@@ -37,7 +40,7 @@ public interface IWlfwYjbwService
 
     /**
      * 修改为老服务监控硬件报文信息
-     * 
+     *
      * @param wlfwYjbw 为老服务监控硬件报文信息
      * @return 结果
      */
@@ -45,7 +48,7 @@ public interface IWlfwYjbwService
 
     /**
      * 批量删除为老服务监控硬件报文信息
-     * 
+     *
      * @param ids 需要删除的为老服务监控硬件报文信息主键集合
      * @return 结果
      */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WlfwYjbwServiceImpl.java

@@ -1,13 +1,17 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.Arrays;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.system.mapper.WlfwYjbwMapper;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.domain.WlfwYjbw;
+import com.ruoyi.system.mapper.WlfwYjbwMapper;
 import com.ruoyi.system.service.IWlfwYjbwService;
+import com.ruoyi.system.utils.SubCodeUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 为老服务监控硬件报文信息Service业务层处理
@@ -45,6 +49,16 @@ public class WlfwYjbwServiceImpl implements IWlfwYjbwService
         return wlfwYjbwMapper.selectList(new LambdaQueryWrapper<>(wlfwYjbw));
     }
 
+    @Override
+    public List<WlfwYjbw> getAdc(WlfwYjbw wlfwYjbw)
+    {
+        if (StringUtils.isEmpty(wlfwYjbw.getCreateAreaCode())) {
+            wlfwYjbw.setCreateAreaCode(SecurityUtils.getAreaCode());
+        }
+        wlfwYjbw.setCreateAreaCode(SubCodeUtil.getSubCode(wlfwYjbw.getCreateAreaCode()).get("code"));
+        return wlfwYjbwMapper.getAdc(wlfwYjbw);
+    }
+
     /**
      * 新增为老服务监控硬件报文信息
      *

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WlfwYjbwMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.WlfwYjbwMapper">
-    
+
     <resultMap type="WlfwYjbw" id="WlfwYjbwResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
@@ -33,4 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="state"    column="state"    />
     </resultMap>
 
-</mapper>
+    <select id="getAdc" parameterType="WlfwYjbw" resultType="java.util.Map">
+        select * from wlfw_yjbw where create_area_code like concat(#{createAreaCode}, '%')
+    </select>
+</mapper>