Merge branch 'dev_thirdplatform' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -86,7 +86,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         String token = this.generateToken(formDTO, userId);
 
         //4.存放Redis
-        this.saveTokenDto(formDTO, userId, userWechatDTO, token);
+        this.saveTokenDto(formDTO, userId, userWechatDTO, token, userWechatDTO.getCustomerId());
 
         //5.接口返参
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
@@ -111,9 +111,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
     /**
      * @Description 将token存入redis
      **/
-    private String saveTokenDto(LoginCommonFormDTO formDTO, String userId, UserWechatDTO userWechatDTO, String token) {
+    private String saveTokenDto(LoginCommonFormDTO formDTO, String userId, UserWechatDTO userWechatDTO, String token, String customerId) {
         int expire = jwtTokenProperties.getExpire();
         TokenDto tokenDto = new TokenDto();
+        tokenDto.setCustomerId(customerId);
         tokenDto.setApp(formDTO.getApp());
         tokenDto.setClient(formDTO.getClient());
         tokenDto.setUserId(userId);

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -10,6 +10,7 @@ package com.epmet.controller;
 
 import com.epmet.cloud.CloudStorageConfig;
 import com.epmet.cloud.OssFactory;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;

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

@@ -4,8 +4,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.CustomerTemplateListFormDTO;
 import com.epmet.dto.form.GetTemplateListFormDTO;
+import com.epmet.dto.form.TemplateListV2FormDTO;
 import com.epmet.dto.result.CustomerTemplateListResultDTO;
 import com.epmet.dto.result.GetTemplateListResultDTO;
+import com.epmet.dto.result.TemplateListV2ResultDTO;
 import com.epmet.service.PersonalTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,6 +39,12 @@ public class PersonalTemplateController {
         return new Result<List<GetTemplateListResultDTO>>().ok(personalTemplateService.templateList(formDTO));
     }
 
+    @PostMapping("templatelistv2")
+    public Result<List<TemplateListV2ResultDTO>> templateList(@RequestBody TemplateListV2FormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<TemplateListV2ResultDTO>>().ok(personalTemplateService.templateListV2(formDTO));
+    }
+
     /**
      * @return
      * @Description 获取客户两个端站内信模板Id

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

@@ -21,10 +21,8 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.PersonalTemplateDTO;
 import com.epmet.dto.form.CustomerTemplateListFormDTO;
 import com.epmet.dto.form.GetTemplateListFormDTO;
-import com.epmet.dto.result.CustomerTempResultDTO;
+import com.epmet.dto.form.TemplateListV2FormDTO;
-import com.epmet.dto.result.CustomerTemplateListResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.GetTemplateListResultDTO;
-import com.epmet.dto.result.TemplateDTO;
 import com.epmet.entity.PersonalTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -105,4 +103,6 @@ public interface PersonalTemplateDao extends BaseDao<PersonalTemplateEntity> {
      * @return java.util.List<com.epmet.dto.PersonalTemplateDTO>
      */
 	List<PersonalTemplateDTO> selectListByKey(@Param("appId") String appId, @Param("tid") String tid, @Param("keyIds") String keyIds);
-}
+
+	List<TemplateListV2ResultDTO> selectTemplateListV2(TemplateListV2FormDTO formDTO);
+}

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

@@ -22,9 +22,11 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.PersonalTemplateDTO;
 import com.epmet.dto.form.CustomerTemplateListFormDTO;
 import com.epmet.dto.form.GetTemplateListFormDTO;
+import com.epmet.dto.form.TemplateListV2FormDTO;
 import com.epmet.dto.result.CustomerTemplateListResultDTO;
 import com.epmet.dto.result.GetTemplateListResultDTO;
 import com.epmet.dto.result.TemplateDTO;
+import com.epmet.dto.result.TemplateListV2ResultDTO;
 import com.epmet.entity.PersonalTemplateEntity;
 
 import java.util.List;
@@ -152,4 +154,6 @@ public interface PersonalTemplateService extends BaseService<PersonalTemplateEnt
      * @return java.util.List<com.epmet.dto.PersonalTemplateDTO>
      */
 	List<PersonalTemplateDTO> getListByKey(String appId, String tid, String keyIds);
-}
+
+	List<TemplateListV2ResultDTO> templateListV2(TemplateListV2FormDTO formDTO);
+}

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

@@ -142,6 +142,9 @@ public class CustomerMpServiceImpl extends BaseServiceImpl<CustomerMpDao, Custom
         //2.调用微信API获取用户信息
         UserWechatDTO resultMap = wxLoginService.resiAndWorkLogin(formDTO.getAppId(), formDTO.getWxCode(), mpDTO.getCustomerId(), mpDTO.getClient());
 
+        //3.返参添加客户Id sun  2021.1.8
+        resultMap.setCustomerId(mpDTO.getCustomerId());
+
         return resultMap;
     }
 

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

@@ -27,9 +27,11 @@ import com.epmet.dao.PersonalTemplateDao;
 import com.epmet.dto.PersonalTemplateDTO;
 import com.epmet.dto.form.CustomerTemplateListFormDTO;
 import com.epmet.dto.form.GetTemplateListFormDTO;
+import com.epmet.dto.form.TemplateListV2FormDTO;
 import com.epmet.dto.result.CustomerTemplateListResultDTO;
 import com.epmet.dto.result.GetTemplateListResultDTO;
 import com.epmet.dto.result.TemplateDTO;
+import com.epmet.dto.result.TemplateListV2ResultDTO;
 import com.epmet.entity.PersonalTemplateEntity;
 import com.epmet.service.PersonalTemplateService;
 import org.apache.commons.lang3.StringUtils;
@@ -42,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
+ *
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-09
@@ -158,4 +160,9 @@ public class PersonalTemplateServiceImpl extends BaseServiceImpl<PersonalTemplat
         return baseDao.selectListByKey(appId, tid, keyIds);
     }
 
-}
+
+    @Override
+    public List<TemplateListV2ResultDTO> templateListV2(TemplateListV2FormDTO formDTO) {
+        return baseDao.selectTemplateListV2(formDTO);
+    }
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/enums/WxMaErrorMsgEnum.java

@@ -551,6 +551,8 @@ public enum WxMaErrorMsgEnum {
 
     CODE_200021(200021, "场景描述 sceneDesc 参数错误"),
 
+    CODE_200022(200022, "该模板已存在"),
+
     CODE_20002(20002, "商品id不存在"),
     CODE_1003(1003, "POST参数非法"),
     CODE_40005(40005, "上传素材文件格式不对"),

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

@@ -35,6 +35,7 @@
         FROM personal_template
         WHERE DEL_FLAG = '0'
           AND APP_ID = #{appId}
+        ORDER BY CREATED_TIME DESC
     </select>
     <select id="selectSetTemp" resultType="com.epmet.dto.PersonalTemplateDTO">
         SELECT ID,
@@ -115,4 +116,20 @@
           AND KEY_IDS = #{keyIds}
     </select>
 
-</mapper>
+    <select id="selectTemplateListV2" resultType="com.epmet.dto.result.TemplateListV2ResultDTO">
+        SELECT
+        tid as "tid",
+        title AS "type",
+        pri_tmpl_id AS "templateId"
+        FROM
+        personal_template
+        WHERE
+        del_flag = '0'
+        AND customer_id = #{customerId}
+        AND client_type = #{app}
+        AND (
+        (KEY_IDS = '5,7,6' and tid = '8171')or
+        (KEY_IDS = '4,9,3' and tid = '2092'))
+        ORDER BY created_time ASC
+    </select>
+</mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java

@@ -110,4 +110,9 @@ public class UserWechatDTO implements Serializable{
 
     //@JsonIgnore
     private String sessionKey;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
 }