同步代码

dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/config/AuroraDataSourceConfig.java

@@ -0,0 +1,83 @@
+package com.dongjian.dashboard.back.common.config;
+
+import com.zaxxer.hikari.HikariDataSource;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import javax.sql.DataSource;
+
+/**
+ * Aurora 数据源配置（独立，不与动态数据源冲突）
+ */
+@Configuration
+@MapperScan(
+        basePackages = "com.dongjian.dashboard.back.dao.aurora", // Aurora Mapper 专用包
+        sqlSessionFactoryRef = "auroraSqlSessionFactory"
+)
+public class AuroraDataSourceConfig {
+
+    @Value("${spring.aurora.datasource.url}")
+    private String url;
+
+    @Value("${spring.aurora.datasource.username}")
+    private String username;
+
+    @Value("${spring.aurora.datasource.password}")
+    private String password;
+
+    @Value("${spring.aurora.datasource.driver-class-name}")
+    private String driverClassName;
+
+    @Value("${spring.aurora.datasource.minimum-idle}")
+    private int minimumIdle;
+
+    @Value("${spring.aurora.datasource.maximum-pool-size}")
+    private int maximumPoolSize;
+
+    @Value("${spring.aurora.datasource.connection-timeout}")
+    private long connectionTimeout;
+
+    /**
+     * Aurora 数据源
+     */
+    @Bean(name = "auroraDataSource")
+    public DataSource auroraDataSource() {
+        HikariDataSource ds = new HikariDataSource();
+        ds.setJdbcUrl(url);
+        ds.setUsername(username);
+        ds.setPassword(password);
+        ds.setDriverClassName(driverClassName);
+        ds.setMinimumIdle(minimumIdle);
+        ds.setMaximumPoolSize(maximumPoolSize);
+        ds.setConnectionTimeout(connectionTimeout);
+        ds.setPoolName("AuroraHikariPool");
+        return ds;
+    }
+
+    @Bean(name = "auroraMybatisConfiguration")
+    public org.apache.ibatis.session.Configuration auroraMybatisConfiguration() {
+        org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration();
+        configuration.setMapUnderscoreToCamelCase(true);//设置驼峰
+        return configuration;
+    }
+
+    /**
+     * Aurora SqlSessionFactory
+     */
+    @Bean(name = "auroraSqlSessionFactory")
+    public SqlSessionFactory auroraSqlSessionFactory(
+            @Qualifier("auroraDataSource") DataSource auroraDataSource)
+            throws Exception {
+        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        bean.setDataSource(auroraDataSource);
+        bean.setConfiguration(auroraMybatisConfiguration());
+        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mappers/aurora/*.xml"));
+        return bean.getObject();
+    }
+}

dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/config/DataSourceAdminConfig.java

@@ -6,6 +6,7 @@ import com.dongjian.dashboard.back.common.Constants;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -22,6 +23,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Configuration
+@MapperScan(
+        basePackages = {"com.dongjian.dashboard.back.dao.ex"},
+        sqlSessionFactoryRef = "sqlSessionFactory"
+)
 public class DataSourceAdminConfig {
 	
 	private static Logger logger = LoggerFactory.getLogger(DataSourceAdminConfig.class);
@@ -78,6 +83,7 @@ public class DataSourceAdminConfig {
     }
 
     @Bean
+    @Primary
     public SqlSessionFactory sqlSessionFactory(@Qualifier("dynamicDataSource") DataSource dynamicDataSource) throws Exception {
         SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
         sessionFactory.setDataSource(dynamicDataSource); // 设置为动态数据源

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_cn.yml

@@ -128,5 +128,6 @@ msgcn:
         addFavoriteDevice: 新增收藏设备
         addDeviceForGroup: 给设备组设置绑定的设备
         delDeviceForGroup: 删除设备组绑定的指定设备
+        editBuildingField: 编辑楼宇属性
 
 

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_en.yml

@@ -128,6 +128,7 @@ msgen:
         addFavoriteDevice: Add favorited device
         addDeviceForGroup: Set bound devices for the device group
         delDeviceForGroup: Remove the specified devices bound to the device group
+        editBuildingField: Edit Building Attributes
 
 
 

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_jp.yml

@@ -128,6 +128,7 @@ msgjp:
         addFavoriteDevice: お気に入りデバイスを追加
         addDeviceForGroup: デバイスグループにバインドされたデバイスを設定する
         delDeviceForGroup: デバイスグループにバインドされた指定されたデバイスを削除する
+        editBuildingField: 建物の属性を編集
 
 
 

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/BuildingController.java

@@ -4,8 +4,12 @@ import com.dongjian.dashboard.back.common.exception.BusinessException;
 import com.dongjian.dashboard.back.common.response.PageInfo;
 import com.dongjian.dashboard.back.common.response.PageResponse;
 import com.dongjian.dashboard.back.common.response.ResponseCode;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
+import com.dongjian.dashboard.back.configurator.aspect.OperationLog;
 import com.dongjian.dashboard.back.configurator.interceptor.AccessRequired;
 import com.dongjian.dashboard.back.dto.building.BuildingSearchParams;
+import com.dongjian.dashboard.back.dto.building.OptFieldParams;
+import com.dongjian.dashboard.back.dto.device.OptDeviceFieldParams;
 import com.dongjian.dashboard.back.service.BuildingService;
 import com.dongjian.dashboard.back.vo.building.BuildingPageVO;
 import io.swagger.v3.oas.annotations.Hidden;
@@ -70,4 +74,17 @@ public class BuildingController {
 		return pageResponse;
 	}
 
+	@OperationLog(operation = "editBuildingField", remark = "")
+	@Operation(summary = "编辑属性")
+	@RequestMapping(value = "/editField",method = RequestMethod.POST)
+	public SimpleDataResponse editField(
+			@RequestBody OptFieldParams optFieldParams,
+			@Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
+			@Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
+			@Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+			@Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long CompanyId,
+			@Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType){
+		return buildingService.editField(optFieldParams, CompanyId, UserId, LanguageType);
+	}
+
 }

dongjian-dashboard-back-controller/src/main/resources/config/application.properties

@@ -23,6 +23,15 @@ dynamic.jdbc.url=jdbc:mysql://${datasourceDNS:rm-bp11k2zm2fr7864428o.mysql.rds.a
 
 spring.datasource.url=jdbc:mysql://${datasourceDNS:rm-bp11k2zm2fr7864428o.mysql.rds.aliyuncs.com:3306}/data_center_aeon_admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=${datasourceTimeZone}
 
+# Aurora 数据源配置
+spring.aurora.datasource.url=${auroraUrl:jdbc:mysql://rm-bp11k2zm2fr7864428o.mysql.rds.aliyuncs.com:3306/data_center_aeon_admin}
+spring.aurora.datasource.username=${auroraUser:zhc}
+spring.aurora.datasource.password=${auroraPass:Youqu48bnb1}
+spring.aurora.datasource.driver-class-name=${auroraDriver:com.mysql.cj.jdbc.Driver}
+spring.aurora.datasource.minimum-idle=${auroraMinIdle:5}
+spring.aurora.datasource.maximum-pool-size=${auroraMaxPool:30}
+spring.aurora.datasource.connection-timeout=${auroraConnTimeout:30000}
+
 
 #配置log日志
 logging.config=classpath:config/logback-boot.xml

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DashboardRealtimeMeasureMapperExt.java → dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/aurora/DashboardRealtimeMeasureMapperExt.java

@@ -1,4 +1,4 @@
-package com.dongjian.dashboard.back.dao.ex;
+package com.dongjian.dashboard.back.dao.aurora;
 
 import com.dongjian.dashboard.back.dao.auto.DashboardRealtimeMeasureMapper;
 import com.dongjian.dashboard.back.model.DashboardRealtimeMeasure;

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DashboardRecordAccumulateMapperExt.java → dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/aurora/DashboardRecordAccumulateMapperExt.java

@@ -1,15 +1,11 @@
-package com.dongjian.dashboard.back.dao.ex;
+package com.dongjian.dashboard.back.dao.aurora;
 
 import com.dongjian.dashboard.back.dao.auto.DashboardRecordAccumulateMapper;
-import com.dongjian.dashboard.back.dao.auto.FavoritedDeviceMapper;
-import com.dongjian.dashboard.back.dto.device.FavoritedDeviceSearchParams;
 import com.dongjian.dashboard.back.vo.device.DeviceIncrement;
-import com.dongjian.dashboard.back.vo.device.FavoritedDeviceVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface DashboardRecordAccumulateMapperExt extends DashboardRecordAccumulateMapper {

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DashboardRealtimeMeasureMapperExt.xml → dongjian-dashboard-back-dao/src/main/resources/mappers/aurora/DashboardRealtimeMeasureMapperExt.xml

@@ -1,6 +1,6 @@
 <?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.dongjian.dashboard.back.dao.ex.DashboardRealtimeMeasureMapperExt">
+<mapper namespace="com.dongjian.dashboard.back.dao.aurora.DashboardRealtimeMeasureMapperExt">
 
     <select id="selectRealtimeMeasureByDevices" parameterType="map" resultType="com.dongjian.dashboard.back.model.DashboardRealtimeMeasure">
         SELECT

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DashboardRecordAccumulateMapperExt.xml → dongjian-dashboard-back-dao/src/main/resources/mappers/aurora/DashboardRecordAccumulateMapperExt.xml

@@ -1,6 +1,6 @@
 <?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.dongjian.dashboard.back.dao.ex.DashboardRecordAccumulateMapperExt">
+<mapper namespace="com.dongjian.dashboard.back.dao.aurora.DashboardRecordAccumulateMapperExt">
 
     <!-- 今天最新 increment_today -->
     <select id="selectTodayIncrement" resultType="com.dongjian.dashboard.back.vo.device.DeviceIncrement">

dongjian-dashboard-back-dao/src/main/resources/mappers/auto/BasicBuildingMapper.xml

@@ -22,6 +22,7 @@
     <result column="brief_introduction" jdbcType="VARCHAR" property="briefIntroduction" />
     <result column="latitude" jdbcType="VARCHAR" property="latitude" />
     <result column="longitude" jdbcType="VARCHAR" property="longitude" />
+    <result column="retain_alert" jdbcType="INTEGER" property="retainAlert" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.dongjian.dashboard.back.model.BasicBuilding">
     <!--
@@ -104,7 +105,7 @@
     -->
     building_id, company_id, `name`, address, flag, create_time, creator_id, modify_time, 
     modifier_id, udf_building_id, building_bucket, thumbnail_num, show_switch_2d3d, brief_introduction, 
-    latitude, longitude
+    latitude, longitude, retain_alert
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -193,15 +194,15 @@
       creator_id, modify_time, modifier_id, 
       udf_building_id, building_bucket, thumbnail_num, 
       show_switch_2d3d, brief_introduction, latitude, 
-      longitude, floor_info_list, picture_introduction
+      longitude, retain_alert, floor_info_list, 
-      )
+      picture_introduction)
     values (#{buildingId,jdbcType=BIGINT}, #{companyId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
       #{address,jdbcType=VARCHAR}, #{flag,jdbcType=INTEGER}, #{createTime,jdbcType=BIGINT}, 
       #{creatorId,jdbcType=BIGINT}, #{modifyTime,jdbcType=BIGINT}, #{modifierId,jdbcType=BIGINT}, 
       #{udfBuildingId,jdbcType=VARCHAR}, #{buildingBucket,jdbcType=VARCHAR}, #{thumbnailNum,jdbcType=INTEGER}, 
       #{showSwitch2d3d,jdbcType=INTEGER}, #{briefIntroduction,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, 
-      #{longitude,jdbcType=VARCHAR}, #{floorInfoList,jdbcType=LONGVARCHAR}, #{pictureIntroduction,jdbcType=LONGVARCHAR}
+      #{longitude,jdbcType=VARCHAR}, #{retainAlert,jdbcType=INTEGER}, #{floorInfoList,jdbcType=LONGVARCHAR}, 
-      )
+      #{pictureIntroduction,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.dongjian.dashboard.back.model.BasicBuilding">
     <!--
@@ -258,6 +259,9 @@
       <if test="longitude != null">
         longitude,
       </if>
+      <if test="retainAlert != null">
+        retain_alert,
+      </if>
       <if test="floorInfoList != null">
         floor_info_list,
       </if>
@@ -314,6 +318,9 @@
       <if test="longitude != null">
         #{longitude,jdbcType=VARCHAR},
       </if>
+      <if test="retainAlert != null">
+        #{retainAlert,jdbcType=INTEGER},
+      </if>
       <if test="floorInfoList != null">
         #{floorInfoList,jdbcType=LONGVARCHAR},
       </if>
@@ -387,6 +394,9 @@
       <if test="record.longitude != null">
         longitude = #{record.longitude,jdbcType=VARCHAR},
       </if>
+      <if test="record.retainAlert != null">
+        retain_alert = #{record.retainAlert,jdbcType=INTEGER},
+      </if>
       <if test="record.floorInfoList != null">
         floor_info_list = #{record.floorInfoList,jdbcType=LONGVARCHAR},
       </if>
@@ -420,6 +430,7 @@
       brief_introduction = #{record.briefIntroduction,jdbcType=VARCHAR},
       latitude = #{record.latitude,jdbcType=VARCHAR},
       longitude = #{record.longitude,jdbcType=VARCHAR},
+      retain_alert = #{record.retainAlert,jdbcType=INTEGER},
       floor_info_list = #{record.floorInfoList,jdbcType=LONGVARCHAR},
       picture_introduction = #{record.pictureIntroduction,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -447,7 +458,8 @@
       show_switch_2d3d = #{record.showSwitch2d3d,jdbcType=INTEGER},
       brief_introduction = #{record.briefIntroduction,jdbcType=VARCHAR},
       latitude = #{record.latitude,jdbcType=VARCHAR},
-      longitude = #{record.longitude,jdbcType=VARCHAR}
+      longitude = #{record.longitude,jdbcType=VARCHAR},
+      retain_alert = #{record.retainAlert,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -504,6 +516,9 @@
       <if test="longitude != null">
         longitude = #{longitude,jdbcType=VARCHAR},
       </if>
+      <if test="retainAlert != null">
+        retain_alert = #{retainAlert,jdbcType=INTEGER},
+      </if>
       <if test="floorInfoList != null">
         floor_info_list = #{floorInfoList,jdbcType=LONGVARCHAR},
       </if>
@@ -534,6 +549,7 @@
       brief_introduction = #{briefIntroduction,jdbcType=VARCHAR},
       latitude = #{latitude,jdbcType=VARCHAR},
       longitude = #{longitude,jdbcType=VARCHAR},
+      retain_alert = #{retainAlert,jdbcType=INTEGER},
       floor_info_list = #{floorInfoList,jdbcType=LONGVARCHAR},
       picture_introduction = #{pictureIntroduction,jdbcType=LONGVARCHAR}
     where building_id = #{buildingId,jdbcType=BIGINT}
@@ -558,7 +574,8 @@
       show_switch_2d3d = #{showSwitch2d3d,jdbcType=INTEGER},
       brief_introduction = #{briefIntroduction,jdbcType=VARCHAR},
       latitude = #{latitude,jdbcType=VARCHAR},
-      longitude = #{longitude,jdbcType=VARCHAR}
+      longitude = #{longitude,jdbcType=VARCHAR},
+      retain_alert = #{retainAlert,jdbcType=INTEGER}
     where building_id = #{buildingId,jdbcType=BIGINT}
   </update>
 </mapper>

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml

@@ -29,7 +29,10 @@
     <select id="getBuildingInfo" resultType="com.dongjian.dashboard.back.vo.data.OverviewVO">
         SELECT
             bbuilding.building_id,
-            bbuilding.name buildingName
+            bbuilding.name buildingName,
+            bbuilding.retain_alert,
+            bbuilding.latitude,
+            bbuilding.longitude
         FROM
             basic_building bbuilding
         WHERE

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/building/OptFieldParams.java

@@ -0,0 +1,15 @@
+package com.dongjian.dashboard.back.dto.building;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class OptFieldParams {
+
+	@Schema(description = "primary key ID", example = "6")
+	private Long buildingId;
+
+	@Schema(description = "dashboard自动恢复告警时是否保留告警：0-不保留，1-保留", example = "1")
+	private Integer retainAlert;
+
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/BasicBuilding.java

@@ -147,6 +147,15 @@ public class BasicBuilding implements Serializable {
      */
     private String longitude;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_building.retain_alert
+     *
+     * @mbg.generated
+     */
+    private Integer retainAlert;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -557,6 +566,30 @@ public class BasicBuilding implements Serializable {
         this.longitude = longitude == null ? null : longitude.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_building.retain_alert
+     *
+     * @return the value of basic_building.retain_alert
+     *
+     * @mbg.generated
+     */
+    public Integer getRetainAlert() {
+        return retainAlert;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_building.retain_alert
+     *
+     * @param retainAlert the value for basic_building.retain_alert
+     *
+     * @mbg.generated
+     */
+    public void setRetainAlert(Integer retainAlert) {
+        this.retainAlert = retainAlert;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column basic_building.floor_info_list
@@ -633,6 +666,7 @@ public class BasicBuilding implements Serializable {
         sb.append(", briefIntroduction=").append(briefIntroduction);
         sb.append(", latitude=").append(latitude);
         sb.append(", longitude=").append(longitude);
+        sb.append(", retainAlert=").append(retainAlert);
         sb.append(", floorInfoList=").append(floorInfoList);
         sb.append(", pictureIntroduction=").append(pictureIntroduction);
         sb.append(", serialVersionUID=").append(serialVersionUID);

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/BasicBuildingExample.java

@@ -1223,6 +1223,66 @@ public class BasicBuildingExample {
             addCriterion("longitude not between", value1, value2, "longitude");
             return (Criteria) this;
         }
+
+        public Criteria andRetainAlertIsNull() {
+            addCriterion("retain_alert is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertIsNotNull() {
+            addCriterion("retain_alert is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertEqualTo(Integer value) {
+            addCriterion("retain_alert =", value, "retainAlert");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertNotEqualTo(Integer value) {
+            addCriterion("retain_alert <>", value, "retainAlert");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertGreaterThan(Integer value) {
+            addCriterion("retain_alert >", value, "retainAlert");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertGreaterThanOrEqualTo(Integer value) {
+            addCriterion("retain_alert >=", value, "retainAlert");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertLessThan(Integer value) {
+            addCriterion("retain_alert <", value, "retainAlert");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertLessThanOrEqualTo(Integer value) {
+            addCriterion("retain_alert <=", value, "retainAlert");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertIn(List<Integer> values) {
+            addCriterion("retain_alert in", values, "retainAlert");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertNotIn(List<Integer> values) {
+            addCriterion("retain_alert not in", values, "retainAlert");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertBetween(Integer value1, Integer value2) {
+            addCriterion("retain_alert between", value1, value2, "retainAlert");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetainAlertNotBetween(Integer value1, Integer value2) {
+            addCriterion("retain_alert not between", value1, value2, "retainAlert");
+            return (Criteria) this;
+        }
     }
 
     /**

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/OverviewVO.java

@@ -13,6 +13,15 @@ public class OverviewVO {
 
     private String buildingName;
 
+    @Schema(description ="latitude", example = "22.467")
+    private String latitude;
+
+    @Schema(description ="longitude", example = "115.783")
+    private String longitude;
+
+    @Schema(description = "dashboard自动恢复告警时是否保留告警：0-不保留，1-保留", example = "1")
+    private Integer retainAlert;
+
     @Schema(description = "全部告警数量",example = "1111")
     private Integer alarmCountAll = 0;
 

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/BuildingService.java

@@ -1,7 +1,9 @@
 package com.dongjian.dashboard.back.service;
 
 import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
 import com.dongjian.dashboard.back.dto.building.BuildingSearchParams;
+import com.dongjian.dashboard.back.dto.building.OptFieldParams;
 import com.dongjian.dashboard.back.vo.building.BuildingPageVO;
 
 /**
@@ -14,4 +16,5 @@ public interface BuildingService {
 	PageInfo<BuildingPageVO> getListPage(BuildingSearchParams pageSearchParam, Long companyId, Long userId,
 										 Integer languageType, Integer uTCOffset);
 
+    SimpleDataResponse editField(OptFieldParams optFieldParams, Long companyId, Long userId, Integer languageType);
 }

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/BuildingServiceImpl.java

@@ -4,8 +4,13 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.ResponseCode;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
 import com.dongjian.dashboard.back.dao.ex.BasicBuildingMapperExt;
 import com.dongjian.dashboard.back.dto.building.BuildingSearchParams;
+import com.dongjian.dashboard.back.dto.building.OptFieldParams;
+import com.dongjian.dashboard.back.model.BasicBuilding;
+import com.dongjian.dashboard.back.model.DeviceInfo;
 import com.dongjian.dashboard.back.service.BuildingService;
 import com.dongjian.dashboard.back.service.common.CommonOpt;
 import com.dongjian.dashboard.back.util.CommonUtil;
@@ -17,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 /**
  * 
@@ -55,4 +62,26 @@ public class BuildingServiceImpl implements BuildingService {
 		return new PageInfo<>(resultList);
 	}
 
+	@Override
+	@Transactional
+	public SimpleDataResponse editField(OptFieldParams optFieldParams, Long companyId, Long userId, Integer languageType) {
+		try {
+			if (1 != optFieldParams.getRetainAlert() && 0 != optFieldParams.getRetainAlert()){
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, "Parameter [retainAlert] error");
+			}
+
+			BasicBuilding basicBuilding = new BasicBuilding();
+			basicBuilding.setBuildingId(optFieldParams.getBuildingId());
+			basicBuilding.setRetainAlert(optFieldParams.getRetainAlert());
+
+			basicBuildingMapperExt.updateByPrimaryKeySelective(basicBuilding);
+
+			return SimpleDataResponse.success();
+		} catch (Exception e){
+			logger.error("editField error", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, ResponseCode.SERVER_ERROR_MSG);
+		}
+	}
+
 }

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java

@@ -11,7 +11,7 @@ import com.dongjian.dashboard.back.common.Constants;
 import com.dongjian.dashboard.back.common.language.msg.MsgLanguageChange;
 import com.dongjian.dashboard.back.common.response.PageInfo;
 import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
-import com.dongjian.dashboard.back.dao.ex.DashboardRecordAccumulateMapperExt;
+import com.dongjian.dashboard.back.dao.aurora.DashboardRecordAccumulateMapperExt;
 import com.dongjian.dashboard.back.dao.ex.DeviceInfoMapperExt;
 import com.dongjian.dashboard.back.dao.ex.FavoritedDeviceMapperExt;
 import com.dongjian.dashboard.back.dto.data.AccumulateDataSearchParam;

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java

@@ -4,7 +4,7 @@ import com.dongjian.dashboard.back.common.Constants;
 import com.dongjian.dashboard.back.common.language.msg.MsgLanguageChange;
 import com.dongjian.dashboard.back.common.response.PageInfo;
 import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
-import com.dongjian.dashboard.back.dao.ex.DashboardRealtimeMeasureMapperExt;
+import com.dongjian.dashboard.back.dao.aurora.DashboardRealtimeMeasureMapperExt;
 import com.dongjian.dashboard.back.dao.ex.DeviceInfoMapperExt;
 import com.dongjian.dashboard.back.dao.ex.FavoritedDeviceMapperExt;
 import com.dongjian.dashboard.back.dto.data.MeasureDataSearchParam;
@@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.function.Function;