接收数据

.gitignore

@@ -33,3 +33,4 @@ build/
 .vscode/
 
 /logs/**
+!**/logs/**

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/alarm/AlarmTypePageDto.java

@@ -22,6 +22,9 @@ public class AlarmTypePageDto extends BasePageDto {
      */
     @ApiModelProperty(value = "设备类型")
     private Integer deviceTypeId;
+
+    @ApiModelProperty(value = "产品类型")
+    private Integer productCategroyId;
     /**
      * 名称
      */

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/DeviceAlarmMapper.java

@@ -0,0 +1,20 @@
+package com.zcxk.rmcp.core.dao;
+
+import com.zcxk.rmcp.core.entity.DeviceAlarm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 
+ * @author linqingwei
+ * @date 2021-08-06 15:42
+ */
+@Mapper
+public interface DeviceAlarmMapper {
+    int insertSelective(DeviceAlarm record);
+
+    int updateByPrimaryKeySelective(DeviceAlarm record);
+
+    int batchInsert(@Param("list") List<DeviceAlarm> list);
+}

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/entity/DeviceAlarm.java

@@ -0,0 +1,87 @@
+package com.zcxk.rmcp.core.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+ * 
+ * @author linqingwei
+ * @date 2021-08-06 15:42
+ */
+@ApiModel(value="com-zcxk-rmcp-core-entity-DeviceAlarm")
+@Data
+public class DeviceAlarm {
+    @ApiModelProperty(value="")
+    private Long id;
+
+    /**
+    * 租户
+    */
+    @ApiModelProperty(value="租户")
+    private String tenantId;
+
+    /**
+    * 设备
+    */
+    @ApiModelProperty(value="设备")
+    private Long deviceId;
+
+    @ApiModelProperty(value="")
+    private Integer measuringId;
+
+    /**
+    * 告警类型
+    */
+    @ApiModelProperty(value="告警类型")
+    private Integer alarmTypeId;
+
+    /**
+    * 首次告警时间
+    */
+    @ApiModelProperty(value="首次告警时间")
+    private LocalDateTime alarmTime;
+
+    /**
+    * 最后告警时间
+    */
+    @ApiModelProperty(value="最后告警时间")
+    private LocalDateTime lastAlarmTime;
+
+    /**
+    * 告警次数
+    */
+    @ApiModelProperty(value="告警次数")
+    private Integer alarmCount;
+
+    /**
+    * 处理状态，1已处理，0未处理
+    */
+    @ApiModelProperty(value="处理状态，1已处理，0未处理")
+    private Boolean handleStatus;
+
+    /**
+    * 处理结果
+    */
+    @ApiModelProperty(value="处理结果")
+    private String handleResult;
+
+    @ApiModelProperty(value="")
+    private String measuringData;
+
+    @ApiModelProperty(value="")
+    private Boolean status;
+
+    @ApiModelProperty(value="")
+    private String createBy;
+
+    @ApiModelProperty(value="")
+    private String updateBy;
+
+    @ApiModelProperty(value="")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value="")
+    private LocalDateTime updateDate;
+}

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/AlarmTypeMapper.xml

@@ -55,6 +55,9 @@ rt.type_desc, rt.tenant_id, rt.alarm_status    </sql>
             <if test="deviceTypeId != null">
                 and device_type_id = #{deviceTypeId}
             </if>
+            <if test="productCategroyId != null">
+                and product_category_id = #{productCategroyId}
+            </if>
             <if test="name != null and name != ''">
                 and name  like concat('%',#{name} ,'%')
             </if>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceAlarmMapper.xml

@@ -0,0 +1,194 @@
+<?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.zcxk.rmcp.core.dao.DeviceAlarmMapper">
+  <resultMap id="BaseResultMap" type="com.zcxk.rmcp.core.entity.DeviceAlarm">
+    <!--@mbg.generated-->
+    <!--@Table rmcp_device_alarm-->
+    <id column="id" property="id" />
+    <result column="tenant_id" property="tenantId" />
+    <result column="device_id" property="deviceId" />
+    <result column="measuring_id" property="measuringId" />
+    <result column="alarm_type_id" property="alarmTypeId" />
+    <result column="alarm_time" property="alarmTime" />
+    <result column="last_alarm_time" property="lastAlarmTime" />
+    <result column="alarm_count" property="alarmCount" />
+    <result column="handle_status" property="handleStatus" />
+    <result column="handle_result" property="handleResult" />
+    <result column="measuring_data" property="measuringData" />
+    <result column="status" property="status" />
+    <result column="create_by" property="createBy" />
+    <result column="update_by" property="updateBy" />
+    <result column="create_date" property="createDate" />
+    <result column="update_date" property="updateDate" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, tenant_id, device_id, measuring_id, alarm_type_id, alarm_time, last_alarm_time, 
+    alarm_count, handle_status, handle_result, measuring_data, `status`, create_by, update_by, 
+    create_date, update_date
+  </sql>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.rmcp.core.entity.DeviceAlarm" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into rmcp_device_alarm
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
+      <if test="deviceId != null">
+        device_id,
+      </if>
+      <if test="measuringId != null">
+        measuring_id,
+      </if>
+      <if test="alarmTypeId != null">
+        alarm_type_id,
+      </if>
+      <if test="alarmTime != null">
+        alarm_time,
+      </if>
+      <if test="lastAlarmTime != null">
+        last_alarm_time,
+      </if>
+      <if test="alarmCount != null">
+        alarm_count,
+      </if>
+      <if test="handleStatus != null">
+        handle_status,
+      </if>
+      <if test="handleResult != null">
+        handle_result,
+      </if>
+      <if test="measuringData != null">
+        measuring_data,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="createDate != null">
+        create_date,
+      </if>
+      <if test="updateDate != null">
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="tenantId != null">
+        #{tenantId},
+      </if>
+      <if test="deviceId != null">
+        #{deviceId},
+      </if>
+      <if test="measuringId != null">
+        #{measuringId},
+      </if>
+      <if test="alarmTypeId != null">
+        #{alarmTypeId},
+      </if>
+      <if test="alarmTime != null">
+        #{alarmTime},
+      </if>
+      <if test="lastAlarmTime != null">
+        #{lastAlarmTime},
+      </if>
+      <if test="alarmCount != null">
+        #{alarmCount},
+      </if>
+      <if test="handleStatus != null">
+        #{handleStatus},
+      </if>
+      <if test="handleResult != null">
+        #{handleResult},
+      </if>
+      <if test="measuringData != null">
+        #{measuringData},
+      </if>
+      <if test="status != null">
+        #{status},
+      </if>
+      <if test="createBy != null">
+        #{createBy},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy},
+      </if>
+      <if test="createDate != null">
+        #{createDate},
+      </if>
+      <if test="updateDate != null">
+        #{updateDate},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.zcxk.rmcp.core.entity.DeviceAlarm">
+    <!--@mbg.generated-->
+    update rmcp_device_alarm
+    <set>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId},
+      </if>
+      <if test="deviceId != null">
+        device_id = #{deviceId},
+      </if>
+      <if test="measuringId != null">
+        measuring_id = #{measuringId},
+      </if>
+      <if test="alarmTypeId != null">
+        alarm_type_id = #{alarmTypeId},
+      </if>
+      <if test="alarmTime != null">
+        alarm_time = #{alarmTime},
+      </if>
+      <if test="lastAlarmTime != null">
+        last_alarm_time = #{lastAlarmTime},
+      </if>
+      <if test="alarmCount != null">
+        alarm_count = #{alarmCount},
+      </if>
+      <if test="handleStatus != null">
+        handle_status = #{handleStatus},
+      </if>
+      <if test="handleResult != null">
+        handle_result = #{handleResult},
+      </if>
+      <if test="measuringData != null">
+        measuring_data = #{measuringData},
+      </if>
+      <if test="status != null">
+        `status` = #{status},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy},
+      </if>
+      <if test="createDate != null">
+        create_date = #{createDate},
+      </if>
+      <if test="updateDate != null">
+        update_date = #{updateDate},
+      </if>
+    </set>
+    where id = #{id}
+  </update>
+  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into rmcp_device_alarm
+    (tenant_id, device_id, measuring_id, alarm_type_id, alarm_time, last_alarm_time, 
+      alarm_count, handle_status, handle_result, measuring_data, `status`, create_by, 
+      update_by, create_date, update_date)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.tenantId}, #{item.deviceId}, #{item.measuringId}, #{item.alarmTypeId}, #{item.alarmTime}, 
+        #{item.lastAlarmTime}, #{item.alarmCount}, #{item.handleStatus}, #{item.handleResult}, 
+        #{item.measuringData}, #{item.status}, #{item.createBy}, #{item.updateBy}, #{item.createDate}, 
+        #{item.updateDate})
+    </foreach>
+  </insert>
+</mapper>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceAlarmRuleMapper.xml

@@ -33,7 +33,7 @@ a.update_date,a. update_by,a. rule_desc, a.value1,a. value2,a. measuring_data_ty
     <select id="selectById" resultMap="DeviceAlarmRuleMap">
         select
         <include refid="Base_Column_List"/>
-        from rmcp_device_alarm_rule
+        from _rule
         where id = #{id}
     </select>
 

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -502,19 +502,21 @@
     left join rmcp_org roc on (roc.ID = rd.company_org_id)
     left join rmcp_org rod on (rod.ID = rd.dept_org_id)
     left join rmcp_community rc on (rc.id = rd.community_id)
-    where rd.status = 1
-    <if test="dto.categoryId != null">and rd.category_id = #{dto.categoryId}</if>
-    <if test="dto.productId != null">and rd.product_id = #{dto.productId}</if>
-    <if test="dto.companyOrgId != null">and rd.company_org_id = #{dto.companyOrgId}</if>
-    <if test="dto.deptOrgId != null">and rd.dept_org_id = #{dto.deptOrgId}</if>
-    <if test="dto.communityId != null">and rd.community_id = #{dto.communityId}</if>
-    <if test="dto.deviceNo != null and dto.deviceNo != ''">and (rd.device_no LIKE concat('%',#{dto.deviceNo},'%') or rd.meter_no LIKE concat('%',#{dto.deviceNo},'%') )</if>
-    <if test="dto.address != null and dto.address != ''">and rd.address LIKE concat('%',#{dto.address},'%') </if>
-    <if test="dto.deviceStatus != null">and rd.device_status = #{dto.deviceStatus}</if>
-    <if test="dto.valveStatus != null">and rd.valve_status = #{dto.deviceStatus}</if>
-    <if test="dto.startDate != null"> and rd.last_receive_time <![CDATA[ >= ]]> #{dto.startDate}</if>
-    <if test="dto.endDate != null"> and rd.last_receive_time <![CDATA[ <= ]]> #{dto.endDate}</if>
-    <include refid="permissionCondition"/>
+    <where>
+      rd.status = 1
+      <if test="dto.categoryId != null">and rd.category_id = #{dto.categoryId}</if>
+      <if test="dto.productId != null">and rd.product_id = #{dto.productId}</if>
+      <if test="dto.companyOrgId != null">and rd.company_org_id = #{dto.companyOrgId}</if>
+      <if test="dto.deptOrgId != null">and rd.dept_org_id = #{dto.deptOrgId}</if>
+      <if test="dto.communityId != null">and rd.community_id = #{dto.communityId}</if>
+      <if test="dto.deviceNo != null and dto.deviceNo != ''">and (rd.device_no LIKE concat('%',#{dto.deviceNo},'%') or rd.meter_no LIKE concat('%',#{dto.deviceNo},'%') )</if>
+      <if test="dto.address != null and dto.address != ''">and rd.address LIKE concat('%',#{dto.address},'%') </if>
+      <if test="dto.deviceStatus != null">and rd.device_status = #{dto.deviceStatus}</if>
+      <if test="dto.valveStatus != null">and rd.valve_status = #{dto.deviceStatus}</if>
+      <if test="dto.startDate != null"> and rd.last_receive_time <![CDATA[ >= ]]> #{dto.startDate}</if>
+      <if test="dto.endDate != null"> and rd.last_receive_time <![CDATA[ <= ]]> #{dto.endDate}</if>
+      <include refid="permissionCondition"/>
+    </where>
     order by rd.create_date desc
   </select>
 
@@ -613,10 +615,12 @@
     from rmcp_device rd
     left join rmcp_product rp on (rp.id = rd.product_id)
     left join rmcp_manufacturer rm on (rm.id = rp.manufacturer_id)
-    where rd.status = 1 and rd.is_install = 0
-    <if test="companyOrgId != null">and rd.company_org_id = #{companyOrgId}</if>
-    <if test="deptOrgId != null">and rd.dept_org_id = #{deptOrgId}</if>
-    <if test="productId != null">and rd.product_id = #{productId}</if>
+    <where>
+      rd.status = 1 and rd.is_install = 0
+      <if test="companyOrgId != null">and rd.company_org_id = #{companyOrgId}</if>
+      <if test="deptOrgId != null">and rd.dept_org_id = #{deptOrgId}</if>
+      <if test="productId != null">and rd.product_id = #{productId}</if>
+    </where>
     order by rd.create_date desc
   </select>
 

zoniot-rmcp/zoniot-rmcp-dap/pom.xml

@@ -10,11 +10,13 @@
     <modelVersion>4.0.0</modelVersion>
     <description>数据接收</description>
 
+
     <artifactId>zoniot-rmcp-dap</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
+        <skipTests>true</skipTests>
     </properties>
 
     <dependencies>

zoniot-rmcp/zoniot-rmcp-dap/src/main/resources/application-dev.properties

@@ -1,14 +1,14 @@
 server.port=8326
 spring.application.name=zoniot-rmcp-dap
 logging.level.root=info
-logging.path=./logs/zoniot-rmcp-dap
+logging.path=../../logs/zoniot-rmcp-dap
 
 
 
 # mysql
-spring.datasource.url=jdbc:mysql://114.135.61.188:33306/rmcp_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.0.0.63:3306/rmcp_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
-spring.datasource.password=100Zone@123
+spring.datasource.password=100zone
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.hikari.max-lifetime=30000
 
@@ -42,22 +42,16 @@ spring.jackson.time-zone=GMT+8
 #spring.jackson.joda-date-time-format: yyyy-MM-dd HH:mm:ss
 
 # redis
-spring.redis.host=114.135.61.188
-spring.redis.port=26379
-spring.redis.password=zoniot
+spring.redis.host=10.0.0.63
+spring.redis.port=6379
 spring.redis.database=2
 spring.redis.timeout=36000
 
 # Lettuce
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.lettuce.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.lettuce.pool.max-wait=100
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
 spring.redis.lettuce.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
 spring.redis.lettuce.pool.min-idle=0
-# \u5173\u95ED\u8D85\u65F6\u65F6\u95F4
 spring.redis.lettuce.shutdown-timeout=100
 
 
@@ -68,9 +62,9 @@ spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 
 
 #utils
-spring.rabbitmq.addresses=114.135.61.188:55672
-spring.rabbitmq.username=zoniot
-spring.rabbitmq.password=zcxk100
+spring.rabbitmq.addresses=10.0.0.63:5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=100zone
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
 spring.rabbitmq.publisher-confirm-type=correlated
@@ -78,8 +72,8 @@ spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
 
 #mongodb url
-#spring.data.mongodb.uri=mongodb://114.135.61.188:17017/meter-reading-database
-spring.data.mongodb.uri=mongodb://127.0.0.1:27017/meter-reading-database
+spring.data.mongodb.uri=mongodb://10.0.0.63:27017/meter-reading-database
+#spring.data.mongodb.uri=mongodb://127.0.0.1:27017/meter-reading-database
 logging.level.org.springframework.data.mongodb.core=DEBUG
 
 

zoniot-rmcp/zoniot-rmcp-dap/src/main/resources/logback-spring.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <springProperty scope="context" name="LOG_PATH" source="logging.path" defaultValue="/tmp" />
+    <springProperty scope="context" name="APPLICATION_NAME" source="spring.application.name" defaultValue="default" />
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+    <jmxConfigurator/>
+
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${LOG_PATH}/${APPLICATION_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>20MB</maxFileSize>
+            <maxHistory>60</maxHistory>
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+
+    </appender>
+
+    <springProfile name="dev,test">
+        <logger name="com.zcxk" level="DEBUG"/>
+        <logger name="org.springframework" level="INFO"/>
+        <logger name="org.apache" level="INFO"/>
+    </springProfile>
+
+    <springProfile name="prop">
+        <logger name="com.zcxk" level="DEBUG"/>
+        <logger name="org.springframework" level="INFO"/>
+        <logger name="org.apache" level="INFO"/>
+    </springProfile>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="FILE"/>
+    </root>
+
+</configuration>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -141,7 +141,7 @@ public class DeviceController {
     @ApiOperation(value = "批量开关阀")
     public AjaxMessage<Void> batchValve(
             @ApiParam(value = "设备id", required = true) @RequestBody(required = true) List<Long> ids,
-            @ApiParam(value = "0:关阀 1:开阀", required = true) @RequestBody(required = true) Integer valveStatus
+            @ApiParam(value = "0:关阀 1:开阀", required = true) @RequestParam(required = true) Integer valveStatus
     ) {
         deviceService.batchValve(ids,valveStatus);
         return AjaxMessage.success();

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 server.port=8325
 spring.application.name=zoniot-rmcp-web
 logging.level.root=info
-logging.path=./logs/zoniot-rmcp-web
+logging.path=../../logs/zoniot-rmcp-web
 files.path=E:/test
 rmcp.url=http://localhost:8325
 
@@ -49,15 +49,10 @@ spring.redis.database=2
 spring.redis.timeout=36000
 
 # Lettuce
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.lettuce.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.lettuce.pool.max-wait=100
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
 spring.redis.lettuce.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
 spring.redis.lettuce.pool.min-idle=0
-# \u5173\u95ED\u8D85\u65F6\u65F6\u95F4
 spring.redis.lettuce.shutdown-timeout=100
 
 
@@ -72,27 +67,12 @@ spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.location=${logging.path}/data
 
-#kafka server
-spring.kafka.bootstrap-servers=114.135.61.188:36377
-#kafka consumer config
-spring.kafka.consumer.group-id=user-group-dev
-spring.kafka.consumer.auto-offset-reset=latest
-spring.kafka.consumer.enable-auto-commit=true
-#kafka producer config
-spring.kafka.producer.retries=0
-spring.kafka.producer.batch-size=4096
-spring.kafka.producer.buffer-memory=40960
-
-spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
-spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
-spring.kafka.consumer.properties.spring.json.trusted.packages=*
-
 #nacos
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 rmcp.sys_config_path=/UMIS_USER_IMAGES/
 rmcp.sys_excel_path=/UMIS_USER_EXCEL/
 
-#utils
+#rabbitmq
 spring.rabbitmq.addresses=10.0.0.63:5672
 spring.rabbitmq.username=admin
 spring.rabbitmq.password=100zone
@@ -103,8 +83,8 @@ spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
 
 #mongodb url
-#spring.data.mongodb.uri=mongodb://10.0.0.63:27017/meter-reading-database
-spring.data.mongodb.uri=mongodb://127.0.0.1:27017/meter-reading-database
+spring.data.mongodb.uri=mongodb://10.0.0.63:27017/meter-reading-database
+#spring.data.mongodb.uri=mongodb://127.0.0.1:27017/meter-reading-database
 logging.level.org.springframework.data.mongodb.core=DEBUG
 
 receive.exchange.name=messageExchangeTest

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-prd.properties

@@ -1,83 +0,0 @@
-server.port=8322
-spring.application.name=user-center
-logging.level.root=info
-logging.path=./logs/user-center
-#\u6570\u636E\u5E93\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://10.0.0.137:3306/uims?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
-spring.datasource.password=100Zone@123
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.hikari.max-lifetime=30000
-mybatis-plus.mapper-locations=classpath:mapper/*.xml
-mybatis-plus.type-aliases-package=com.zcxk.entity
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis-plus.global-config.db-config.logic-delete-value=0 
-mybatis-plus.global-config.db-config.logic-not-delete-value=1
-spring.jackson.time-zone=GMT+8
-#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-#spring.jackson.joda-date-time-format: yyyy-MM-dd HH:mm:ss
-
-# utils
-spring.redis.host=10.0.0.136
-spring.redis.port=6379
-spring.redis.password=zoniot
-spring.redis.database=2
-spring.redis.timeout=36000
-
-# Lettuce
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.lettuce.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.lettuce.pool.max-wait=100
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.lettuce.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.lettuce.pool.min-idle=0
-# \u5173\u95ED\u8D85\u65F6\u65F6\u95F4
-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.136:8321/user/principal
-security.oauth2.resource.prefer-token-info=false
-
-
-spring.servlet.multipart.max-file-size=100MB
-spring.servlet.multipart.max-request-size=100MB
-spring.servlet.multipart.location=${logging.path}/data
-
-#kafka server
-spring.kafka.bootstrap-servers=114.135.61.188:36377
-#kafka consumer config
-spring.kafka.consumer.group-id=user-group-dev
-spring.kafka.consumer.auto-offset-reset=latest
-spring.kafka.consumer.enable-auto-commit=true
-#kafka producer config
-spring.kafka.producer.retries=0
-spring.kafka.producer.batch-size=4096
-spring.kafka.producer.buffer-memory=40960
-
-spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
-spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
-spring.kafka.consumer.properties.spring.json.trusted.packages=*
-
-#nacos
-spring.cloud.nacos.discovery.server-addr=10.0.0.136:8848
-UMIS.sys_config_path=/UMIS_USER_IMAGES/
-UMIS.sys_excel_path=/UMIS_USER_EXCEL/
-#utils
-spring.rabbitmq.host=47.112.217.10
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=huaxu
-spring.rabbitmq.password=huaxu123
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.connection-timeout=15000
-spring.rabbitmq.publisher-confirm-type=correlated
-spring.rabbitmq.publisher-returns=true
-spring.rabbitmq.template.mandatory=true
-receive.exchange.name=messageExchangeTest
-dispath.routing.key=dipathKeyTest
-dispath.queue=dispathTest
-add_iot_user_url=http://39.108.175.9:8090/api/integration/user/savePlatformUser

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-sit.properties

@@ -50,15 +50,10 @@ spring.redis.database=2
 spring.redis.timeout=36000
 
 # Lettuce
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.lettuce.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.lettuce.pool.max-wait=100
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
 spring.redis.lettuce.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
 spring.redis.lettuce.pool.min-idle=0
-# \u5173\u95ED\u8D85\u65F6\u65F6\u95F4
 spring.redis.lettuce.shutdown-timeout=100
 
 
@@ -73,27 +68,13 @@ spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.location=${logging.path}/data
 
-#kafka server
-spring.kafka.bootstrap-servers=114.135.61.188:36377
-#kafka consumer config
-spring.kafka.consumer.group-id=user-group-dev
-spring.kafka.consumer.auto-offset-reset=latest
-spring.kafka.consumer.enable-auto-commit=true
-#kafka producer config
-spring.kafka.producer.retries=0
-spring.kafka.producer.batch-size=4096
-spring.kafka.producer.buffer-memory=40960
-
-spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
-spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
-spring.kafka.consumer.properties.spring.json.trusted.packages=*
 
 #nacos
 spring.cloud.nacos.discovery.server-addr=10.0.0.63:8848
 rmcp.sys_config_path=/UMIS_USER_IMAGES/
 rmcp.sys_excel_path=/UMIS_USER_EXCEL/
 
-#utils
+#rabbitmq
 spring.rabbitmq.addresses=10.0.0.63:5672
 spring.rabbitmq.username=admin
 spring.rabbitmq.password=100zone