revert third

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

@@ -154,12 +154,6 @@
             <artifactId>alibaba-dingtalk-service-sdk</artifactId>
             <version>1.0.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-message-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 

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

@@ -4,10 +4,8 @@ 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;
@@ -39,12 +37,6 @@ 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,8 +21,10 @@ 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.form.TemplateListV2FormDTO;
+import com.epmet.dto.result.CustomerTempResultDTO;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.CustomerTemplateListResultDTO;
+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;
@@ -103,6 +105,4 @@ 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,11 +22,9 @@ 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;
@@ -154,6 +152,4 @@ 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/PersonalTemplateServiceImpl.java

@@ -27,11 +27,9 @@ 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;
@@ -44,7 +42,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *
+ * 
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-09
@@ -134,11 +132,6 @@ public class PersonalTemplateServiceImpl extends BaseServiceImpl<PersonalTemplat
         return baseDao.selectTemplateList(formDTO);
     }
 
-    @Override
-    public List<TemplateListV2ResultDTO> templateListV2(TemplateListV2FormDTO formDTO) {
-        return baseDao.selectTemplateListV2(formDTO);
-    }
-
     /**
      * @return
      * @Description 获取客户两个端站内信模板Id
@@ -165,4 +158,4 @@ public class PersonalTemplateServiceImpl extends BaseServiceImpl<PersonalTemplat
         return baseDao.selectListByKey(appId, tid, keyIds);
     }
 
-}
+}

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

@@ -90,23 +90,6 @@
         ORDER BY created_time ASC
     </select>
 
-    <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>
-
     <select id="selectCustomerTemplateList" resultType="com.epmet.dto.result.CustomerTemplateListResultDTO">
         SELECT
             pt.title AS "templateType",
@@ -132,4 +115,4 @@
           AND KEY_IDS = #{keyIds}
     </select>
 
-</mapper>
+</mapper>