Merge branch 'master' into feature-tenant

# Conflicts:
#	bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroup.java
#	bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroupUsr.java
#	bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendUsrDetail.java
#	bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectProj.java
#	bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectTask.java

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/handle/RootMsgHandler.java

@@ -109,8 +109,15 @@ public class RootMsgHandler extends TopicMsgEngine {
             machineProcess.setRecordTime(DateTimeUtil.getDateFromMills(machineProcess.getDataTime()));
             machineProcess.setDt(
                 DateTimeUtil.getDateFromMills(machineProcess.getDataTime(), DateTimeUtil.DateFormatter.yyyyMMdd));
+            // 结合下行深度effectiveDown 以及 开始和结束时间 sendStartTime sendEndTime，计算平均下行速度
+            machineProcess.setAvgSpeed(machineProcess.getEffectiveDown()
+                / (machineProcess.getEndTime() - machineProcess.getStartTime()) * 1000);
+            // 结合下行深度effectiveDown 以及 开始和结束时间 pullingStartTime pullingEndTime， 计算平均拔管速度。并且保留两位小数
+            machineProcess.setAvgUpSpeed(machineProcess.getEffectiveDown()
+                / (machineProcess.getPullingEndTime() - machineProcess.getPullingStartTime()) * 1000);
             machineProcessResultService.insertMachineProcessResult(machineProcess);
             machineRealtimeEventListener.handleConsResult(machineProcess);
+            return;
         }
         if (topic.endsWith(topicDataCfg.getProcessTopic().getName())) {
             JSONObject jsonObject = json.getJSONObject(TOPIC_PAYLOAD);

bd-park/park-backend/park-collect/src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
   application:
     name: ems-collect
   profiles:
-    active: pre
+    active: local
     include:
       - topic
       - schedule

bd-park/park-backend/park-collect/src/test/java/com/huashe/park/collect/controller/TopicControllerTest.java

@@ -108,13 +108,29 @@ class TopicControllerTest {
         // 启动线程
         processThread.start();
         resultThread.start();
+
         // 等待线程执行完成
         try {
             processThread.join();
             resultThread.join();
+
         }
         catch (InterruptedException e) {
             e.printStackTrace();
         }
+        // 模拟施工结束，再次施工之前推送回带量数据
+        machineProcessResults.forEach(result -> {
+            byte[] bytes;
+            try {
+                System.out.println(">>>>>>>>>>>>>>>>>" + result.getId());
+                result.setSprayVolume(0.37f);
+                bytes = ByteArrayUtil.serializeObject(result);
+                mqttTemplate.sendByte("110DS98412300212/TEST002", "110DS98412300212/TEST002/machine/piling/result",
+                    bytes, 0, false);
+            }
+            catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
     }
 }

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroup.java

@@ -1,10 +1,11 @@
 package com.huashe.park.domain.entity;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import com.alibaba.fastjson2.JSONArray;
 import com.huashe.common.annotation.Excel;
 import com.huashe.common.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 考勤组对象 park_attend_group
@@ -70,20 +71,12 @@ public class ParkAttendGroup extends BaseEntity {
         this.timeRange = timeRange;
     }
 
-
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("remark", getRemark())
-                .append("poly", getPoly())
-                .append("timeRange", getTimeRange())
-                .append("updateTime", getUpdateTime())
-                .append("createTime", getCreateTime())
-                .append("createBy", getCreateBy())
-                .append("updateBy", getUpdateBy())
-                .append("tenantId", getTenantId())
-                .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("name", getName())
+            .append("remark", getRemark()).append("poly", getPoly()).append("timeRange", getTimeRange())
+            .append("updateTime", getUpdateTime()).append("createTime", getCreateTime())
+            .append("createBy", getCreateBy()).append("updateBy", getUpdateBy()).append("tenantId", getTenantId())
+            .toString();
     }
 }

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroupUsr.java

@@ -105,7 +105,6 @@ public class ParkAttendGroupUsr extends BaseEntity {
         return usrDept;
     }
 
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendUsrDetail.java

@@ -134,7 +134,6 @@ public class ParkAttendUsrDetail extends BaseEntity {
         return attendGroupId;
     }
 
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectProj.java

@@ -51,6 +51,7 @@ public class ParkInspectProj extends BaseEntity {
     private String projType;
 
 
+
     public void setId(Long id) {
         this.id = id;
     }

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectTask.java

@@ -26,7 +26,6 @@ public class ParkInspectTask extends BaseEntity
     @Excel(name = "巡检计划")
     private String schedule;
 
-
     public void setId(Long id) 
     {
         this.id = id;

common-cloud/tool-modules/general-data/sql/table.sql

@@ -51,7 +51,7 @@ CREATE TABLE `adm_holiday` (
     `name`    VARCHAR(128) NOT NULL COMMENT '节假日',
     `name_cn` VARCHAR(128) NOT NULL COMMENT '节假日中文',
     `name_en` VARCHAR(128) NOT NULL COMMENT '节假日英文',
-    `type`       VARCHAR(64) NOT NULL COMMENT '节假日类型',
+    `type`    VARCHAR(64) NOT NULL COMMENT '节假日类型',
     PRIMARY KEY (`date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='节假日信息表';
 

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/controller/DateAttrConrtoller.java

@@ -12,8 +12,8 @@ package com.huashe.common.data.controller;
 
 import com.huashe.common.data.config.ApiAuth;
 import com.huashe.common.data.model.CallResponse;
-import com.huashe.common.data.model.DateAttr;
 import com.huashe.common.data.service.DateService;
+import com.huashe.common.domain.model.DateAttr;
 import com.huashe.common.exception.BusinessException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/controller/RegionController.java

@@ -12,8 +12,8 @@ package com.huashe.common.data.controller;
 
 import com.huashe.common.data.config.ApiAuth;
 import com.huashe.common.data.model.CallResponse;
-import com.huashe.common.data.model.Region;
 import com.huashe.common.data.service.RegionService;
+import com.huashe.common.domain.model.Region;
 import com.huashe.common.exception.BusinessException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/controller/WeatherController.java

@@ -12,11 +12,11 @@ package com.huashe.common.data.controller;
 
 import com.huashe.common.data.config.ApiAuth;
 import com.huashe.common.data.model.CallResponse;
-import com.huashe.common.data.model.WeatherType;
 import com.huashe.common.data.service.TaskService;
 import com.huashe.common.data.service.WeatherService;
 import com.huashe.common.domain.model.WeatherForecast;
 import com.huashe.common.domain.model.WeatherRt;
+import com.huashe.common.domain.model.WeatherType;
 import com.huashe.common.exception.BusinessException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/mapper/DimGaWeatherMapper.java

@@ -10,9 +10,7 @@
  */
 package com.huashe.common.data.mapper;
 
-import com.huashe.common.data.model.Region;
-import com.huashe.common.domain.model.GaWeatherType;
-import com.huashe.common.domain.model.GbRegion;
+import com.huashe.common.data.model.GaWeatherType;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/mapper/DimGbRegionMapper.java

@@ -10,8 +10,8 @@
  */
 package com.huashe.common.data.mapper;
 
-import com.huashe.common.data.model.Region;
-import com.huashe.common.domain.model.GbRegion;
+import com.huashe.common.data.model.GbRegion;
+import com.huashe.common.domain.model.Region;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

prod-common/src/main/java/com/huashe/common/domain/model/GaWeatherType.java → common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/model/GaWeatherType.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.huashe.common.domain.model;
+package com.huashe.common.data.model;
 
 /**
  * 国标天气分类

prod-common/src/main/java/com/huashe/common/domain/model/GbRegion.java → common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/model/GbRegion.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.huashe.common.domain.model;
+package com.huashe.common.data.model;
 
 /**
  * 行政区划

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/service/DateService.java

@@ -10,7 +10,7 @@
  */
 package com.huashe.common.data.service;
 
-import com.huashe.common.data.model.DateAttr;
+import com.huashe.common.domain.model.DateAttr;
 
 import java.util.List;
 

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/service/RegionService.java

@@ -10,7 +10,7 @@
  */
 package com.huashe.common.data.service;
 
-import com.huashe.common.data.model.Region;
+import com.huashe.common.domain.model.Region;
 
 import java.util.List;
 

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/service/WeatherService.java

@@ -10,9 +10,9 @@
  */
 package com.huashe.common.data.service;
 
-import com.huashe.common.data.model.WeatherType;
 import com.huashe.common.domain.model.WeatherForecast;
 import com.huashe.common.domain.model.WeatherRt;
+import com.huashe.common.domain.model.WeatherType;
 
 import java.util.List;
 

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/service/impl/DateServiceImpl.java

@@ -15,9 +15,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.huashe.common.data.config.CollectConfig;
 import com.huashe.common.data.mapper.AdmHolidayMapper;
-import com.huashe.common.data.model.DateAttr;
 import com.huashe.common.data.service.DateService;
 import com.huashe.common.data.util.HttpUtils;
+import com.huashe.common.domain.model.DateAttr;
 import com.huashe.common.domain.model.Holiday;
 import com.huashe.common.exception.Assert;
 import com.huashe.common.exception.BusinessException;
@@ -115,25 +115,25 @@ public class DateServiceImpl implements DateService {
         String ret = null;
         switch (i) {
             case Calendar.MONDAY:
-                ret = "周一";
+                ret = "星期一";
                 break;
             case Calendar.TUESDAY:
-                ret = "周二";
+                ret = "星期二";
                 break;
             case Calendar.WEDNESDAY:
-                ret = "周三";
+                ret = "星期三";
                 break;
             case Calendar.THURSDAY:
-                ret = "周四";
+                ret = "星期四";
                 break;
             case Calendar.FRIDAY:
-                ret = "周五";
+                ret = "星期五";
                 break;
             case Calendar.SATURDAY:
-                ret = "周六";
+                ret = "星期六";
                 break;
             case Calendar.SUNDAY:
-                ret = "周日";
+                ret = "星期日";
                 break;
             default:
                 throw new BusinessException(-1, "week error.");

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/service/impl/RegionServiceImpl.java

@@ -11,9 +11,9 @@
 package com.huashe.common.data.service.impl;
 
 import com.huashe.common.data.mapper.DimGbRegionMapper;
-import com.huashe.common.data.model.Region;
+import com.huashe.common.data.model.GbRegion;
 import com.huashe.common.data.service.RegionService;
-import com.huashe.common.domain.model.GbRegion;
+import com.huashe.common.domain.model.Region;
 import com.huashe.common.utils.ListUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.compress.utils.Lists;

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/service/impl/WeatherServiceimpl.java

@@ -13,11 +13,11 @@ package com.huashe.common.data.service.impl;
 import com.huashe.common.data.mapper.AdmWeatherForecastMapper;
 import com.huashe.common.data.mapper.AdmWeatherRtMapper;
 import com.huashe.common.data.mapper.DimGaWeatherMapper;
-import com.huashe.common.data.model.WeatherType;
+import com.huashe.common.data.model.GaWeatherType;
 import com.huashe.common.data.service.WeatherService;
-import com.huashe.common.domain.model.GaWeatherType;
 import com.huashe.common.domain.model.WeatherForecast;
 import com.huashe.common.domain.model.WeatherRt;
+import com.huashe.common.domain.model.WeatherType;
 import com.huashe.common.utils.ListUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

common-cloud/tool-modules/general-data/src/main/resources/mapper/DimGaWeatherMapper.xml

@@ -1,7 +1,7 @@
 <?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.huashe.common.data.mapper.DimGaWeatherMapper">
-    <resultMap id="BaseResultMap" type="com.huashe.common.domain.model.GaWeatherType">
+    <resultMap id="BaseResultMap" type="com.huashe.common.data.model.GaWeatherType">
         <result column="key" property="key" jdbcType="VARCHAR"/>
         <result column="value" property="value" jdbcType="VARCHAR"/>
         <result column="desc" property="desc" jdbcType="VARCHAR"/>

common-cloud/tool-modules/general-data/src/main/resources/mapper/DimGbRegionMapper.xml

@@ -1,7 +1,7 @@
 <?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.huashe.common.data.mapper.DimGbRegionMapper">
-    <resultMap id="BaseResultMap" type="com.huashe.common.domain.model.GbRegion">
+    <resultMap id="BaseResultMap" type="com.huashe.common.data.model.GbRegion">
         <result column="adcode" property="adcode" jdbcType="VARCHAR"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
         <result column="area_type" property="areaType" jdbcType="INTEGER"/>
@@ -20,7 +20,7 @@
         <include refid="selectGbRegion"/>
     </select>
 
-    <select id="getGbRegion" parameterType="com.huashe.common.data.model.Region" resultMap="BaseResultMap">
+    <select id="getGbRegion" parameterType="com.huashe.common.domain.model.Region" resultMap="BaseResultMap">
         <include refid="selectGbRegion"/>
         <where>
             <if test="parentArea != null and parentArea != ''">and parent_area = #{parentArea}</if>

ems/sql/ems_server.sql

@@ -397,6 +397,20 @@ INSERT INTO `dim_ems_emission_factor` (`region_code`, `region_name`, `region_typ
 INSERT INTO `dim_ems_emission_factor` (`region_code`, `region_name`, `region_type`, `factor_value`, `factor_type`, `version`) VALUES ('CN', '中国', '0', '0.8426', '3', '2021');
 
 -- ----------------------------
+-- 行政区划表
+-- ----------------------------
+DROP TABLE IF EXISTS `dim_gb_region`;
+CREATE TABLE `dim_gb_region` (
+  `adcode` varchar(8) NOT NULL COMMENT '地区编码',
+  `name` varchar(64) NOT NULL COMMENT '地区名称',
+  `area_type` int(8) DEFAULT NULL COMMENT '1:省，2:直辖市/省会，3：地级市，4：区县/县级市',
+  `parent_area` varchar(8) DEFAULT NULL COMMENT '父级地区编码',
+  `parent_area_name` varchar(64) DEFAULT NULL COMMENT '父级地区名称',
+  PRIMARY KEY (`adcode`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='行政区编码表（GB_T 2260）';
+
+
+-- ----------------------------
 -- 区域对象表
 -- ----------------------------
 drop table if exists adm_area;
@@ -438,6 +452,20 @@ create table adm_area_attr (
 
 
 -- ----------------------------
+-- 节假日
+-- ----------------------------
+DROP TABLE IF EXISTS `adm_holiday`;
+CREATE TABLE `adm_holiday` (
+  `date`    date NOT NULL COMMENT '日期',
+  `name`    VARCHAR(128) NOT NULL COMMENT '节假日',
+  `name_cn` VARCHAR(128) NOT NULL COMMENT '节假日中文',
+  `name_en` VARCHAR(128) NOT NULL COMMENT '节假日英文',
+  `type`    VARCHAR(64) NOT NULL COMMENT '节假日类型',
+  PRIMARY KEY (`date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='节假日信息表';
+
+
+-- ----------------------------
 -- 天气状况分类与代码表
 -- ----------------------------
 DROP TABLE IF EXISTS `dim_ga_weather`;

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/model/DateAttr.java → prod-common/src/main/java/com/huashe/common/domain/model/DateAttr.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.huashe.common.data.model;
+package com.huashe.common.domain.model;
 
 /**
  * 日期属性
@@ -20,8 +20,14 @@ package com.huashe.common.data.model;
  * @since [产品/模块版本]
  */
 public class DateAttr {
+    /**
+     * 日期
+     */
     private String date;
 
+    /**
+     * 星期几-数字
+     */
     private int week;
 
     /**

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/model/Region.java → prod-common/src/main/java/com/huashe/common/domain/model/Region.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.huashe.common.data.model;
+package com.huashe.common.domain.model;
 
 import java.util.List;
 

common-cloud/tool-modules/general-data/src/main/java/com/huashe/common/data/model/WeatherType.java → prod-common/src/main/java/com/huashe/common/domain/model/WeatherType.java

@@ -8,7 +8,7 @@
  * 修改单号:  <修改单号>
  * 修改内容:  <修改内容>
  */
-package com.huashe.common.data.model;
+package com.huashe.common.domain.model;
 
 import java.util.List;