查询场景修改

message/src/main/resources/application-dev.properties

@@ -39,7 +39,7 @@ spring.redis.lettuce.shutdown-timeout=100
 security.oauth2.client.client-id=smart-city-v2
 security.oauth2.client.client-secret=smart-city-v2-123
 security.oauth2.resource.id=smartcity-deivice-service
-security.oauth2.resource.user-info-uri=http://10.0.0.135:8321/user/principal
+security.oauth2.resource.user-info-uri=http://localhost:8321/user/principal
 security.oauth2.resource.prefer-token-info=false
 
 

sms_water/src/main/java/com/huaxu/controller/DeviceController.java

@@ -97,6 +97,7 @@ public class DeviceController {
         deviceDto.setDeptOrgId(deptOrgId);
         deviceDto.setSceneId(sceneId);
         deviceDto.setEnableState(enableState);
+        deviceDto.setSearchType(searchType);
         return new AjaxMessage<>(ResultStatus.OK, deviceService.selectList(deviceDto));
     }
 

sms_water/src/main/java/com/huaxu/dto/DeviceDto.java

@@ -38,6 +38,10 @@ public class DeviceDto extends DeviceEntity {
     private String companyOrgName;
     @ApiModelProperty(value = "所属部门")
     private String deptOrgName;
+    @ApiModelProperty(value = "查询类型")
+    @TableField(exist = false)
+    @JsonIgnore
+    private Integer searchType;
 
     @ApiModelProperty(value = "场景ids" ,hidden = true )
     private List<Long> sceneIds;

sms_water/src/main/resources/mapper/DeviceMapper.xml

@@ -61,7 +61,12 @@
         from sms_device d
         left join sms_device_type t on d.DEVICE_TYPE_ID = t.id
         <if test="deviceDto.sceneId!= null and deviceDto.sceneId != 0 ">
-            inner join sms_device_scene s on s.DEVICE_ID=d.ID and s.SCENE_ID=#{deviceDto.sceneId} and s.status=1
+           <if test="deviceDto.searchType == null or deviceDto.searchType == 0 ">
+            inner join sms_device_scene s on s.DEVICE_ID=d.ID and (s.SCENE_ID=#{deviceDto.sceneId} or s.parent_scene_id = #{deviceDto.sceneId}) and s.status=1
+           </if>
+            <if test="deviceDto.searchType != null and deviceDto.searchType == 1 ">
+                inner join sms_device_scene s on s.DEVICE_ID=d.ID and s.SCENE_ID=#{deviceDto.sceneId} and s.status=1
+            </if>
         </if>
         <if test="deviceDto.sceneIds!= null and deviceDto.sceneIds.size()>0 ">
             inner join sms_device_scene s on s.DEVICE_ID=d.ID and s.status=1 and s.SCENE_ID in