Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	ruoyi-ui/src/api/emergencycommand/info.js
#	ruoyi-ui/src/assets/styles/picture-common.scss
#	ruoyi-ui/src/views/picture/command-dispatch/index.vue
#	ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/iot-detail.vue

cjy-project/src/main/java/com/cjy/iot/controller/IotInfoController.java

@@ -110,7 +110,7 @@ public class IotInfoController extends BaseController {
 	@RequestMapping("/export/{type}")
 	public void export(HttpServletResponse response,@PathVariable("type") String type) {
 
-		List<ExportIotDataEntity> list = iotInfoService.selectAllIotInfoList(type);
+		List<ExportIotDataEntity> list = iotInfoService.selectAllIotInfoList(type,getUserOrganCode().toString());
 		list.stream().forEach(item->{
 			if(item.getResourceDescribe()!=null){
 				item.setResourceDescribe(filterHtml(item.getResourceDescribe()));

cjy-project/src/main/java/com/cjy/iot/mapper/IotInfoMapper.java

@@ -108,5 +108,5 @@ public interface IotInfoMapper
     String getIotByResourceCode(String resourceCode);
 
 
-    List<ExportIotDataEntity>  selectAllIotInfoList(String type);
+    List<ExportIotDataEntity>  selectAllIotInfoList(@Param("type") String type,@Param("organCode") String organCode);
 }

cjy-project/src/main/java/com/cjy/iot/service/IIotInfoService.java

@@ -43,7 +43,7 @@ public interface IIotInfoService {
 	 * @param iotInfo
 	 * @return
 	 */
-	List<ExportIotDataEntity>  selectAllIotInfoList(String type);
+	List<ExportIotDataEntity>  selectAllIotInfoList(String type,String organCode);
 
 	/**
 	 * 小程序获取设备列表

cjy-project/src/main/java/com/cjy/iot/service/impl/IotInfoServiceImpl.java

@@ -335,7 +335,7 @@ public class IotInfoServiceImpl implements IIotInfoService {
 
 
 	@Override
-	public List<ExportIotDataEntity> selectAllIotInfoList(String type) {
-		return iotInfoMapper.selectAllIotInfoList(type);
+	public List<ExportIotDataEntity> selectAllIotInfoList(String type,String organCode) {
+		return iotInfoMapper.selectAllIotInfoList(type,organCode);
 	}
 }

cjy-project/src/main/resources/mapper/iotInfo/IotInfoMapper.xml

@@ -442,9 +442,9 @@
             <if test="deviceIndex != null">device_index = #{deviceIndex},</if>
             <if test="regionId != null">region_id = #{regionId},</if>
             <if test="outCode != null">out_code=#{outCode},</if>
-            <if test="outCode != null">ip_address=#{ipAddress},</if>
-            <if test="outCode != null">mac_address=#{macAddress},</if>
-            <if test="outCode != null">geographical_location=#{geographicalLocation},</if>
+            <if test="ipAddress != null">ip_address=#{ipAddress},</if>
+            <if test="macAddress != null">mac_address=#{macAddress},</if>
+            <if test="geographicalLocation != null">geographical_location=#{geographicalLocation},</if>
         </trim>
         where id = #{id}
     </update>
@@ -600,7 +600,7 @@
             resource_code,humidity,ultraviolet_rays_strength,optical_radiation_intensity,negative_oxygen_ions,ambient_vol,pressure,wind_direction,pm2p5,sulfur_dioxide,ozone,pm10,nitrogen_dioxide,carbon_monoxide,air_quality_index_aqi,rainfall)
             t3 ON t1.resource_code = t3.resource_code
         </if>
-        where  t1.del_flag != '2' and t1.type=#{type}
+        where  t1.del_flag != '2' and t1.type=#{type} and  t1.organ_code = #{organCode}
     </select>
     <update id="appletsUpdaeDeviceStatus">
         update b_iot_info

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -291,6 +291,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				 LEFT JOIN sys_role_dept t4 on t1.dept_id=t4.dept_id
 				 LEFT JOIN sys_role t5 on t4.role_id=t5.role_id
 		where t1.user_id = #{userId}
-		  and t1.del_flag !=2
+		  and t1.del_flag !=2 and t3.del_flag!=2
 	</select>
 </mapper>

ruoyi-ui/.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 邢台海洋乐园OA系统
+VUE_APP_TITLE = 邢台海洋乐园管控和应急指挥调度平台
 
 # 开发环境配置
 ENV = 'development'

ruoyi-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 邢台海洋乐园OA系统
+VUE_APP_TITLE = 邢台海洋乐园管控和应急指挥调度平台
 
 # 生产环境配置
 ENV = 'production'

ruoyi-ui/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 邢台海洋乐园OA系统
+VUE_APP_TITLE = 邢台海洋乐园管控和应急指挥调度平台
 
 NODE_ENV = production
 

ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.5",
-  "description": "邢台海洋乐园OA系统",
+  "description": "邢台海洋乐园管控和应急指挥调度平台",
   "author": "创巨圆",
   "license": "MIT",
   "scripts": {

ruoyi-ui/public/index.html

@@ -13,7 +13,7 @@
     <script src="https://webapi.amap.com/maps?v=1.4.15&key=7231218170a7459001b54d9b8c73cee6&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.DistrictSearch,AMap.MouseTool,AMap.PolyEditor,AMap.Polyline"></script>
     <script src="http://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
     <link rel="icon" href="<%= BASE_URL %>logo.png">
-    <title>邢台海洋乐园OA系统</title>
+    <title>邢台海洋乐园管控和应急指挥调度平台</title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
     html,

ruoyi-ui/scenicPages/index.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><script>window._AMapSecurityConfig = {
         securityJsCode:'f72bd09cfd16027ad5586a6105cc8594',
-      }</script><script src="https://webapi.amap.com/maps?v=1.4.15&key=7231218170a7459001b54d9b8c73cee6&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.DistrictSearch,AMap.MouseTool,AMap.PolyEditor,AMap.Polyline"></script><script src="http://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script><link rel=icon href=/logo.png><title>邢台海洋乐园OA系统</title><!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--><style>html,
+      }</script><script src="https://webapi.amap.com/maps?v=1.4.15&key=7231218170a7459001b54d9b8c73cee6&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.DistrictSearch,AMap.MouseTool,AMap.PolyEditor,AMap.Polyline"></script><script src="http://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script><link rel=icon href=/logo.png><title>邢台海洋乐园管控和应急指挥调度平台</title><!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--><style>html,
     body,
     #app {
       height: 100%;

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -2,12 +2,12 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <img v-if="logo" src="@/assets/images/logo.png" class="sidebar-logo" />
+<!--        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>-->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <img v-if="logo" src="@/assets/images/logo.png" class="sidebar-logo" />
+<!--        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>-->
       </router-link>
     </transition>
   </div>
@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       title: '景区综合管控平台',
-      logo: null
+      logo: true
     }
   }
 }
@@ -90,4 +90,7 @@ export default {
     }
   }
 }
+.sidebar-logo{
+  width: 80% !important;
+}
 </style>

ruoyi-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">邢台海洋乐园OA系统</h3>
+      <h3 class="title">邢台海洋乐园管控和应急指挥调度平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

ruoyi-ui/src/views/picture/resource-monitoring/index.vue

@@ -527,7 +527,7 @@ export default {
     //初始化卫星地图
     initMap() {
       const map = new AMap.Map('mapDiv', {
-        center: [115.710998,37.827129],
+        center: [114.538083,37.032308],
         resizeEnable: true,
         zoom: 20,
         mapStyle: "amap://styles/blue"
@@ -713,8 +713,8 @@ export default {
         zIndex:10,
         // getTileUrl:'tiles/[z]/tile-[x]_[y].png',
         getTileUrl: function(x,y,z){
-          console.log('https://www.lbgjtoa.com/appImg/tiles/' + z + '/tile-' + x +'_' + y + '.png')
-          return 'https://www.lbgjtoa.com/appImg/tiles/' + z + '/' + x +'_' + y + '.png'
+          console.log('http://jqgk.hbcjy.com/img/tiles/' + z + '/tile-' + x +'_' + y + '.png')
+          return 'http://jqgk.hbcjy.com/img/tiles/' + z + '/' + x +'_' + y + '.png'
         }
       });
       tilerLayer.setMap(this.map)

ruoyi-ui/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '邢台海洋乐园OA系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '邢台海洋乐园管控和应急指挥调度平台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口