大棚关联用户

agri-framework/src/main/java/com/agri/framework/web/dispatcher/MqttMessageDispatcher.java

@@ -7,6 +7,8 @@ import com.agri.framework.interceptor.FrontendControlHandler;
 import com.agri.framework.interceptor.FrontendOnlineHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -41,6 +43,8 @@ public class MqttMessageDispatcher {
     @Resource
     private FrontendOnlineHandler frontendOnlineHandler;
 
+    @Autowired
+    private Environment env;
 
     /**
      * 前端在线心跳处理器
@@ -58,7 +62,7 @@ public class MqttMessageDispatcher {
     public void handleMessage(String topic, String payload) {
         try {
             // log.info("【MQTT接收】topic={}, payload={}", topic, payload);
-
+            if (env.acceptsProfiles("dev")) return;
             // 设备状态主题：dtu/{deviceId}/up
             if (topic.matches("dtu/\\w+/\\w+")) {
                 deviceStatusHandler.handle(topic, payload);

agri-system/src/main/java/com/agri/system/controller/SysDtuRemarkController.java

@@ -1,20 +1,19 @@
 package com.agri.system.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.ibatis.ognl.ObjectElementsAccessor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 import com.agri.common.annotation.Log;
 import com.agri.common.core.controller.BaseController;
 import com.agri.common.core.domain.AjaxResult;
+import com.agri.common.core.page.TableDataInfo;
 import com.agri.common.enums.BusinessType;
+import com.agri.common.utils.poi.ExcelUtil;
 import com.agri.system.domain.SysDtuRemark;
 import com.agri.system.service.ISysDtuRemarkService;
-import com.agri.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.agri.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * dtu设备备注Controller
@@ -57,7 +56,7 @@ public class SysDtuRemarkController extends BaseController
     /**
      * 获取dtu设备备注详细信息
      */
-    @PreAuthorize("@ss.hasPermi('assets:remark:query')")
+    @PreAuthorize("@ss.hasPermi('assets:remark:list')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -101,7 +100,7 @@ public class SysDtuRemarkController extends BaseController
     /**
      * 获取dtu设备备注详细信息
      */
-    @PreAuthorize("@ss.hasPermi('assets:remark:query')")
+    @PreAuthorize("@ss.hasPermi('assets:remark:list')")
     @GetMapping(value = "/getDtuByImei")
     public AjaxResult getDtuByImei(@RequestParam("imei") String imei)
     {

agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml

@@ -43,8 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             user_agri.user_id
         FROM
             sys_agri_info agri
-            LEFT JOIN sys_user_agri user_agri ON user_agri.agri_id = agri.id
+            LEFT JOIN sys_user_agri user_agri ON user_agri.agri_id = agri.imei
-            <if test="userId != null"> and user_agri.user_id = #{userId}</if>
         </sql>
 
     <select id="selectSysAgriInfoList" parameterType="SysAgriInfo" resultMap="SysAgriInfoResult">
@@ -134,8 +133,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="findAgriByUser" parameterType="SysAgriInfo" resultMap="SysAgriInfoResult">
         <include refid="agriUserVo"/>
+        <if test="userId == null"> and user_agri.user_id is null </if>
         <where>
             is_deleted = 0
+            <if test="userId != null"> and user_agri.user_id = #{userId}</if>
             <if test="imei != null  and imei != ''"> and agri.imei = #{imei}</if>
             <if test="agriName != null  and agriName != ''"> and agri.agri_name like concat('%', #{agriName}, '%')</if>
             <if test="alarmStatus != null "> and agri.alarm_status = #{alarmStatus}</if>