Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.5
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.7
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.5</version>
+    <version>0.0.7</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -121,8 +121,9 @@ public class WorkActServiceImpl implements WorkActService {
               sponsorResultDTO.setAgencyGridList(ConvertUtils.sourceToTarget(result.getData().getAgencyGridList(), Grid.class));
               return sponsorResultDTO;
           }
-        }
+        }else{
             logger.error("当前用户id获取为空");
+        }
         return null;
     }
 

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.4
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.5
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/MessagePushTextFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/7/28 14:35
+ */
+@Data
+public class MessagePushTextFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2156552140364818299L;
+
+    private String ToUserName;
+    private String FromUserName;
+    private Date weChatCreateTime;
+    private String MsgType;
+    private String Content;
+    private String MsgId;
+    private Integer delFlag = 0;
+    private Integer revision = 0;
+    private String createdBy = "APP_USER";
+    private String updatedBy = "APP_USER";
+}

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.73
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.75
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.73</version>
+    <version>0.0.75</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/MessagePushTextDao.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.MessagePushTextFormDTO;
+import com.epmet.entity.MessagePushTextEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *  
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-28
+ */
+@Mapper
+public interface MessagePushTextDao extends BaseDao<MessagePushTextEntity> {
+
+    int insertMessageText(MessagePushTextFormDTO entity);
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/MessagePushTextEntity.java

@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ *  
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-28
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("message_push_text")
+public class MessagePushTextEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 开发者微信号
+     */
+	private String toUserName;
+
+    /**
+     * 发送方帐号（一个OpenID）
+     */
+	private String fromUserName;
+
+    /**
+     * 消息创建时间
+     */
+	private Date wechatCreateTime;
+
+    /**
+     * 消息类型，文本为text
+     */
+	private String msgType;
+
+    /**
+     * 文本消息内容
+     */
+	private String content;
+
+    /**
+     * 消息id，64位整型
+     */
+	private String msgId;
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@@ -3,11 +3,9 @@ package com.epmet.service.impl;
 import com.alibaba.nacos.client.config.utils.IOUtils;
 import com.epmet.constant.ModuleConstant;
 import com.epmet.constant.ThirdRunTimeInfoConstant;
-import com.epmet.dao.CodeAuditRecordDao;
+import com.epmet.dao.*;
-import com.epmet.dao.CodeAuditResultDao;
-import com.epmet.dao.CodeCustomerDao;
-import com.epmet.dao.MiniInfoDao;
 import com.epmet.dto.form.CodeAuditRecordFormDTO;
+import com.epmet.dto.form.MessagePushTextFormDTO;
 import com.epmet.dto.result.CustomerIdAndClientResultDTO;
 import com.epmet.dto.result.TemplateAndAppIdResultDTO;
 import com.epmet.mpaes.AesException;
@@ -55,6 +53,10 @@ public class WarrantServiceImpl implements WarrantService {
     private CodeCustomerDao codeCustomerDao;
     @Autowired
     private CodeAuditResultDao codeAuditResultDao;
+    @Autowired
+    private ComponentVerifyTicketServiceImpl componentVerifyTicketServiceImpl;
+    @Autowired
+    private MessagePushTextDao messagePushTextDao;
 
     /**
      * @Description  1.保存代码审核结果 2.更新代码上传结果
@@ -91,9 +93,10 @@ public class WarrantServiceImpl implements WarrantService {
         Map<String, Object> result = WXXmlToMapUtil.multilayerXmlToMap(msg);
         Map<String,Object> xml = (Map<String, Object>) result.get(ModuleConstant.XML);
         if (xml.get(ModuleConstant.MSG_TYPE).equals(ModuleConstant.EVENT_LOW)) {
+            // TODO 目前来看，msgType = ‘event’ 的是代码审核结果
             Long createTime = Long.valueOf(xml.get(ModuleConstant.CREATE_TIME).toString());
             CodeAuditRecordFormDTO codeAuditRecord = componentVerifyTicketService.mapToEntity(xml, CodeAuditRecordFormDTO.class);
-            codeAuditRecord.setWechatCreateTime(new Date(createTime));
+            codeAuditRecord.setWechatCreateTime(componentVerifyTicketServiceImpl.sToDate(createTime.toString()));
             String toUserName = codeAuditRecord.getToUserName();//小程序原始ID
             CustomerIdAndClientResultDTO customerIdAndClientResultDTO = miniInfoDao.selectCustomerIdAndClientByToUserName(toUserName);
             String clientType = customerIdAndClientResultDTO.getClientType();
@@ -113,15 +116,23 @@ public class WarrantServiceImpl implements WarrantService {
             switch (event) {
                 case ModuleConstant.WEAPP_AUDIT_SUCCESS:
                     codeResult = ModuleConstant.AUDIT_SUCCESS;
+                    break;
                 case ModuleConstant.WEAPP_AUDIT_FAIL:
                     codeResult = ModuleConstant.AUDIT_FAILED;
+                    break;
                 case ModuleConstant.WEAPP_AUDIT_DELAY:
                     codeResult = ModuleConstant.DELAY;
+                    break;
             }
             String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord);
             codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult);
         }else if (xml.get(ModuleConstant.MSG_TYPE).equals(ModuleConstant.TEXT)){
-
+            // TODO 公众号回复消息
+            MessagePushTextFormDTO messagePushTextFormDTO = componentVerifyTicketService.mapToEntity(xml, MessagePushTextFormDTO.class);
+            Object createTime = xml.get(ModuleConstant.CREATE_TIME);
+            Date date = componentVerifyTicketServiceImpl.sToDate(createTime.toString());
+            messagePushTextFormDTO.setWeChatCreateTime(date);
+            messagePushTextDao.insertMessageText(messagePushTextFormDTO);
         }
         return ModuleConstant.SUCCESS;
     }

epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.2__thirdUpdate.sql

@@ -0,0 +1,18 @@
+alter table code_operation_history modify column DESCRIPTION varchar(2048) COMMENT '描述';
+
+CREATE TABLE `message_push_text`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `TO_USER_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开发者微信号',
+  `FROM_USER_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发送方帐号（一个OpenID）',
+  `WECHAT_CREATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '消息创建时间',
+  `MSG_TYPE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息类型，文本为text',
+  `CONTENT` varchar(3072) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本消息内容',
+  `MSG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息id，64位整型',
+  `DEL_FLAG` int(11) NOT NULL COMMENT '删除状态 0：正常，1：删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = ' ' ROW_FORMAT = Dynamic;

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditRecordDao.xml

@@ -5,7 +5,7 @@
 
     <!-- 插入代码审核结果 -->
     <insert id="insertCodeAuditRecord">
-        INSERT INTO code_audit_result ( ID, CUSTOMER_ID, TEMPLATE_ID, CLIENT_TYPE, AUTH_APP_ID, TO_USER_NAME, FROM_USER_NAME, WECHAT_CREATE_TIME,
+        INSERT INTO code_audit_record ( ID, CUSTOMER_ID, TEMPLATE_ID, CLIENT_TYPE, AUTH_APP_ID, TO_USER_NAME, FROM_USER_NAME, WECHAT_CREATE_TIME,
             MSG_TYPE, EVENT, SUCC_TIME, FAIL_TIME, DELAY_TIME, REASON, SCREEN_SHOT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME)
         VALUES
             (

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml

@@ -26,7 +26,7 @@
         SET result = #{codeResult}
         WHERE del_flag = '0'
             AND customer_id = #{customerId}
-            AND template_id = #{templateId}
+            AND code_id = #{codeCustomerId}
     </update>
 
 

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml

@@ -67,6 +67,8 @@
             del_flag = '0'
             AND customer_id = #{customerId}
             AND client_type = #{clientType}
+            order by created_time desc
+            LIMIT 1
     </select>
 
     <!-- 查询 code_customer 表ID -->

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MessagePushTextDao.xml

@@ -0,0 +1,26 @@
+<?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.epmet.dao.MessagePushTextDao">
+
+
+    <insert id="insertMessageText">
+        INSERT INTO message_push_text ( ID, TO_USER_NAME, FROM_USER_NAME, WECHAT_CREATE_TIME, MSG_TYPE, CONTENT, MSG_ID, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        VALUES
+            (
+                REPLACE ( UUID(), '-', '' ),
+                #{ToUserName},
+                #{FromUserName},
+                #{weChatCreateTime},
+                #{MsgType},
+                #{Content},
+                #{MsgId},
+                #{delFlag},
+                #{revision},
+                #{createdBy},
+                NOW(),
+                #{updatedBy},
+                NOW()
+            )
+    </insert>
+</mapper>

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/MiniInfoDao.xml

@@ -51,5 +51,6 @@
         WHERE
             del_flag = 0
             AND user_name = #{toUserName}
+        LIMIT 1
     </select>
 </mapper>

epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.77
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.79
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.77</version>
+    <version>0.3.79</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml

@@ -121,7 +121,7 @@
     <select id="selectActSponsorGrid" resultType="com.epmet.dto.result.ActSponsorGridInfo" parameterType="java.lang.String">
         SELECT
             csg.GRID_ID,
-            CONCAT( ca.ORGANIZATION_NAME, '-', cg.GRID_NAME ) AS agencyGridName,
+            CONCAT( ca.ORGANIZATION_NAME, '-', cg.GRID_NAME ) AS agencyGridName
         FROM
             customer_staff_grid csg
             LEFT JOIN customer_grid cg ON ( csg.GRID_ID = cg.ID AND cg.DEL_FLAG = '0' )

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.85
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.86
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.84
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.86
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.85</version>
+    <version>0.3.86</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>