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

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/constant/ThirdConstant.java

@@ -0,0 +1,17 @@
+package com.epmet.constant;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/1/19 9:43
+ */
+public interface ThirdConstant {
+	/**
+	 * 小程序
+	 */
+	String MINI = "mini";
+	/**
+	 * 第三方app
+	 */
+	String APP = "app";
+}

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

@@ -48,6 +48,11 @@ public class PaCustomerDTO implements Serializable {
      */
     private Integer isInitialize;
 
+	/**
+	 * 客户类型 mini 微信小程序客户 app 第三方app客户
+	 */
+	private String type;
+
     /**
      * 数据来源(dev:开发 test:体验 prod:生产)
      */

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java

@@ -6,6 +6,8 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.CustomerMpDTO;
+import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.*;
@@ -35,6 +37,12 @@ public class PaCustomerController {
     @Autowired
     private CustomerMpService customerMpService;
 
+    @GetMapping("{id}")
+    public Result<PaCustomerDTO> get(@PathVariable("id") String id){
+        PaCustomerDTO data = paCustomerService.get(id);
+        return new Result<PaCustomerDTO>().ok(data);
+    }
+
     /**
      * @param formDTO
      * @return

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

@@ -48,6 +48,11 @@ public class PaCustomerEntity extends BaseEpmetEntity {
      */
 	private Integer isInitialize;
 
+	/**
+	 * 客户类型 mini 微信小程序客户 app 第三方app客户
+	 */
+	private String type;
+
     /**
      * 数据来源(dev:开发 test:体验 prod:生产)
      */

epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.12__alter_pa_customer.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `pa_customer`
+ADD COLUMN `TYPE` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'mini'
+COMMENT '客户类型 mini 微信小程序客户 app 第三方app客户' AFTER `IS_INITIALIZE`;