Skip to content

H
haoban-manage3.0
Commit b1b9f596 by 徐高华
Options

Merge branch 'developer' of 

http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

Conflicts:
	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java
parents e3459ab3 1c10c7b0
Showing with 2286 additions and 1483 deletions
haoban-manage3-api/pom.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>gic-pom-base</artifactId> <artifactId>gic-pom-base</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
<relativePath/> <relativePath/>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>haoban-manage3-api</artifactId> <artifactId>haoban-manage3-api</artifactId>
<version>${libraryVersion}</version> <version>${libraryVersion}</version>
<name>haoban-manage3-api</name> <name>haoban-manage3-api</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<libraryVersion>3.0-SNAPSHOT</libraryVersion> <libraryVersion>3.0-SNAPSHOT</libraryVersion>
</properties> </properties>
<distributionManagement> <distributionManagement>
<repository> <repository>
<!-- 和 Maven setting 保持一致 --> <!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id> <id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name> <name>nexus distribution snapshot repository</name>
<!-- 这里使用 /content/repositories/snapshots/ --> <!-- 这里使用 /content/repositories/snapshots/ -->
<url>http://182.254.134.223:8081/nexus/content/repositories/snapshots/</url> <url>http://182.254.134.223:8081/nexus/content/repositories/snapshots/</url>
<!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>--> <!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>-->
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<!-- 和 Maven setting 保持一致 --> <!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id> <id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name> <name>nexus distribution snapshot repository</name>
<!-- 这里使用 /content/repositories/snapshots/ --> <!-- 这里使用 /content/repositories/snapshots/ -->
<url>http://182.254.134.223:8081/nexus/content/repositories/Snapshots-1/</url> <url>http://182.254.134.223:8081/nexus/content/repositories/Snapshots-1/</url>
<!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>--> <!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>-->
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-base-api</artifactId> <artifactId>haoban-base-api</artifactId>
<version>${haoban-base-api}</version> <version>${haoban-base-api}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>gic-commons</artifactId> <artifactId>gic-commons</artifactId>
<version>${gic-commons}</version> <version>${gic-commons}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>haoban-manage3-api</finalName> <finalName>haoban-manage3-api</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version> <version>2.7</version>
<executions> <executions>
<execution> <execution>
<id>default-deploy</id> <id>default-deploy</id>
<phase>deploy</phase> <phase>deploy</phase>
<goals> <goals>
<goal>deploy</goal> <goal>deploy</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId> <artifactId>flatten-maven-plugin</artifactId>
<!--<version>1.1.0-SNAPSHOT</version>--> <!--<version>1.1.0-SNAPSHOT</version>-->
<configuration> <configuration>
<flattenMode>defaults</flattenMode> <flattenMode>defaults</flattenMode>
</configuration> </configuration>
<executions> <executions>
<!-- enable flattening --> <!-- enable flattening -->
<execution> <execution>
<id>flatten</id> <id>flatten</id>
<phase>process-resources</phase> <phase>process-resources</phase>
<goals> <goals>
<goal>flatten</goal> <goal>flatten</goal>
</goals> </goals>
</execution> </execution>
<!-- ensure proper cleanup --> <!-- ensure proper cleanup -->
<execution> <execution>
<id>flatten.clean</id> <id>flatten.clean</id>
<phase>clean</phase> <phase>clean</phase>
<goals> <goals>
<goal>clean</goal> <goal>clean</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkDTO.java
...@@ -40,9 +40,17 @@ public class HmLinkDTO implements Serializable { ...@@ -40,9 +40,17 @@ public class HmLinkDTO implements Serializable {
private String memberLabelId; private String memberLabelId;
/**0删除 1正常*/ /**0删除 1正常*/
private Integer statusFlag; private Integer statusFlag;
private String shortCode ;
private List<HmLinkStoreDTO> storeList; private List<HmLinkStoreDTO> storeList;
public String getShortCode() {
return shortCode;
}
public void setShortCode(String shortCode) {
this.shortCode = shortCode;
}
public List<HmLinkStoreDTO> getStoreList() { public List<HmLinkStoreDTO> getStoreList() {
return storeList; return storeList;
} }
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkWxaDTO.java
...@@ -16,7 +16,7 @@ public class HmLinkWxaDTO implements Serializable { ...@@ -16,7 +16,7 @@ public class HmLinkWxaDTO implements Serializable {
private static final long serialVersionUID = 6473795387449522116L; private static final long serialVersionUID = 6473795387449522116L;
private HmPageTemplateDTO page; private HmPageDTO page;
// 二维码 // 二维码
private String hmQrcode; private String hmQrcode;
...@@ -60,11 +60,11 @@ public class HmLinkWxaDTO implements Serializable { ...@@ -60,11 +60,11 @@ public class HmLinkWxaDTO implements Serializable {
this.selectStoreFlag = selectStoreFlag; this.selectStoreFlag = selectStoreFlag;
} }
public HmPageTemplateDTO getPage() { public HmPageDTO getPage() {
return page; return page;
} }
public void setPage(HmPageTemplateDTO page) { public void setPage(HmPageDTO page) {
this.page = page; this.page = page;
} }
} }
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageTemplateRespDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageDTO.java
...@@ -9,9 +9,10 @@ import java.util.Date; ...@@ -9,9 +9,10 @@ import java.util.Date;
* @Description * @Description
* @Version * @Version
**/ **/
public class HmPageTemplateRespDTO implements Serializable { public class HmPageDTO implements Serializable {
private static final long serialVersionUID = 8049920392780217427L;
private static final long serialVersionUID = 4804653087679367805L;
/** /**
* 落地页id * 落地页id
*/ */
...@@ -87,6 +88,14 @@ public class HmPageTemplateRespDTO implements Serializable { ...@@ -87,6 +88,14 @@ public class HmPageTemplateRespDTO implements Serializable {
private Date updateTime; private Date updateTime;
public Long getPageId() {
return pageId;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public String getPageCode() { public String getPageCode() {
return pageCode; return pageCode;
} }
...@@ -103,30 +112,6 @@ public class HmPageTemplateRespDTO implements Serializable { ...@@ -103,30 +112,6 @@ public class HmPageTemplateRespDTO implements Serializable {
this.pageName = pageName; this.pageName = pageName;
} }
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getPageTitle() { public String getPageTitle() {
return pageTitle; return pageTitle;
} }
...@@ -175,6 +160,30 @@ public class HmPageTemplateRespDTO implements Serializable { ...@@ -175,6 +160,30 @@ public class HmPageTemplateRespDTO implements Serializable {
this.guideComment = guideComment; this.guideComment = guideComment;
} }
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getCreateorId() { public String getCreateorId() {
return createorId; return createorId;
} }
...@@ -222,12 +231,4 @@ public class HmPageTemplateRespDTO implements Serializable { ...@@ -222,12 +231,4 @@ public class HmPageTemplateRespDTO implements Serializable {
public void setUpdateTime(Date updateTime) { public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
public Long getPageId() {
return pageId;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
} }
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageRelationRespDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageRelationDTO.java
package com.gic.haoban.manage.api.dto.hm; package com.gic.haoban.manage.api.dto.hm;
import com.gic.haoban.manage.api.enums.hm.HmPageType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* @Author MUSI * @Author MUSI
...@@ -9,7 +10,7 @@ import java.util.Date; ...@@ -9,7 +10,7 @@ import java.util.Date;
* @Description * @Description
* @Version * @Version
**/ **/
public class HmPageRelationRespDTO implements Serializable { public class HmPageRelationDTO implements Serializable {
private static final long serialVersionUID = 8682427720134740563L; private static final long serialVersionUID = 8682427720134740563L;
/** /**
...@@ -41,7 +42,7 @@ public class HmPageRelationRespDTO implements Serializable { ...@@ -41,7 +42,7 @@ public class HmPageRelationRespDTO implements Serializable {
/** /**
* 引用方来源 * 引用方来源
* *
* @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateType * @see HmPageType
*/ */
private Integer type; private Integer type;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageQueryDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmPageQDTO.java
package com.gic.haoban.manage.api.dto.hm; package com.gic.haoban.manage.api.dto.qdto.hm;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
...@@ -10,7 +10,7 @@ import java.util.Date; ...@@ -10,7 +10,7 @@ import java.util.Date;
* @Description * @Description
* @Version * @Version
**/ **/
public class HmPageQueryDTO extends BasePageInfo { public class HmPageQDTO extends BasePageInfo {
private static final long serialVersionUID = 7554464387425111232L; private static final long serialVersionUID = 7554464387425111232L;
private String pageSearchText; private String pageSearchText;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmPageRelationQueryDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmPageRelationQDTO.java
package com.gic.haoban.manage.api.dto.hm; package com.gic.haoban.manage.api.dto.qdto.hm;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
...@@ -8,7 +8,7 @@ import com.gic.haoban.base.api.common.BasePageInfo; ...@@ -8,7 +8,7 @@ import com.gic.haoban.base.api.common.BasePageInfo;
* @Description * @Description
* @Version * @Version
**/ **/
public class HmPageRelationQueryDTO extends BasePageInfo { public class HmPageRelationQDTO extends BasePageInfo {
private static final long serialVersionUID = -7239030561346484410L; private static final long serialVersionUID = -7239030561346484410L;
private String searchText; private String searchText;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/dto/WelcomeRemoveDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/dto/WelcomeRemoveCheckDTO.java
...@@ -9,8 +9,9 @@ import java.io.Serializable; ...@@ -9,8 +9,9 @@ import java.io.Serializable;
* @Version * @Version
* 活码删除失败时返回对象 * 活码删除失败时返回对象
**/ **/
public class WelcomeRemoveDTO implements Serializable { public class WelcomeRemoveCheckDTO implements Serializable {
private static final long serialVersionUID = 6300468958582699365L;
/** /**
* 活码引用数量 * 活码引用数量
*/ */
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/hm/HmPageTemplateStatus.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/hm/HmPageStatus.java
...@@ -6,7 +6,7 @@ package com.gic.haoban.manage.api.enums.hm; ...@@ -6,7 +6,7 @@ package com.gic.haoban.manage.api.enums.hm;
* @Description * @Description
* @Version * @Version
**/ **/
public enum HmPageTemplateStatus { public enum HmPageStatus {
/** /**
...@@ -18,7 +18,7 @@ public enum HmPageTemplateStatus { ...@@ -18,7 +18,7 @@ public enum HmPageTemplateStatus {
* 删除 * 删除
*/ */
DISABLE(0, "禁用"); DISABLE(0, "禁用");
HmPageTemplateStatus(Integer code, String desc){ HmPageStatus(Integer code, String desc){
this.code = code; this.code = code;
this.desc = desc; this.desc = desc;
} }
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/hm/HmPageTemplateType.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/hm/HmPageType.java
...@@ -6,11 +6,11 @@ package com.gic.haoban.manage.api.enums.hm; ...@@ -6,11 +6,11 @@ package com.gic.haoban.manage.api.enums.hm;
* @Description * @Description
* @Version * @Version
**/ **/
public enum HmPageTemplateType { public enum HmPageType {
LINK(1, "引流链接"); LINK(1, "引流链接");
HmPageTemplateType(Integer code, String desc){ HmPageType(Integer code, String desc){
this.code = code; this.code = code;
this.desc = desc; this.desc = desc;
} }
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmGroupApiService.java
...@@ -44,5 +44,5 @@ public interface HmGroupApiService { ...@@ -44,5 +44,5 @@ public interface HmGroupApiService {
* @param wxEnterpriseId * @param wxEnterpriseId
* @return * @return
*/ */
ServiceResponse<Integer> queryGroupReferCount(String enterpriseId, String wxEnterpriseId); ServiceResponse<Integer> queryGroupTotalReferCount(String enterpriseId, String wxEnterpriseId);
} }
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmLinkApiService.java
...@@ -49,5 +49,5 @@ public interface HmLinkApiService { ...@@ -49,5 +49,5 @@ public interface HmLinkApiService {
* @throws * @throws
*/ */
public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, Integer whitchStore, String storeId, public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, Integer whitchStore, String storeId,
String clerkId, String linkId, String mixPhone, String unionid); String clerkId, String linkShortCode, String mixPhone, String unionid);
} }
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmPageTemplateApiService.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmPageApiService.java
...@@ -2,11 +2,10 @@ package com.gic.haoban.manage.api.service.hm; ...@@ -2,11 +2,10 @@ package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.HmPageQueryDTO; import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationQueryDTO; import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationRespDTO; import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO; import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO;
/** /**
* @Author MUSI * @Author MUSI
...@@ -14,24 +13,24 @@ import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO; ...@@ -14,24 +13,24 @@ import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO;
* @Description * @Description
* @Version 落地页相关 * @Version 落地页相关
**/ **/
public interface HmPageTemplateApiService { public interface HmPageApiService {
/** /**
* 保存/修改 落地页模板 * 保存/修改 落地页模板
* *
* @param pageTemplateDTO * @param hmPageDTO
* @return * @return
*/ */
ServiceResponse<Long> saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO); ServiceResponse<Long> saveOrUpdateHmPage(HmPageDTO hmPageDTO);
/** /**
* 删除 活码落地页 * 删除 活码落地页
* *
* @param pageTemplateDTO * @param pageDTO
* @return * @return
*/ */
ServiceResponse<Boolean> deleteHmPageTemplate(HmPageTemplateDTO pageTemplateDTO); ServiceResponse<Boolean> deleteHmPage(HmPageDTO pageDTO);
/** /**
...@@ -40,20 +39,20 @@ public interface HmPageTemplateApiService { ...@@ -40,20 +39,20 @@ public interface HmPageTemplateApiService {
* @param pageQueryDTO * @param pageQueryDTO
* @return * @return
*/ */
ServiceResponse<Page<HmPageTemplateRespDTO>> queryPageTemplateList(HmPageQueryDTO pageQueryDTO); ServiceResponse<Page<HmPageDTO>> queryPageList(HmPageQDTO pageQueryDTO);
/** /**
* 条件查询落地页关联详情 * 条件查询落地页关联详情
* @param relationQueryDTO * @param relationQueryDTO
* @return * @return
*/ */
ServiceResponse<Page<HmPageRelationRespDTO>> queryPageRelation(HmPageRelationQueryDTO relationQueryDTO); ServiceResponse<Page<HmPageRelationDTO>> queryPageRelation(HmPageRelationQDTO relationQueryDTO);
/** /**
* 根据页面id 查询 * 根据页面id 查询
* @param templateId * @param pageId
* @return * @return
*/ */
ServiceResponse<HmPageTemplateRespDTO> queryPageTemplateDetail(Long templateId); ServiceResponse<HmPageDTO> queryPageDetail(Long pageId);
} }
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/out/WelcomeApiService.java
...@@ -5,7 +5,7 @@ import com.gic.api.base.commons.ServiceResponse; ...@@ -5,7 +5,7 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO; import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
...@@ -123,6 +123,14 @@ public interface WelcomeApiService { ...@@ -123,6 +123,14 @@ public interface WelcomeApiService {
* @param welcomeId * @param welcomeId
* @return * @return
*/ */
ServiceResponse<WelcomeRemoveDTO> removeWelcomeWithErrorInfo(String welcomeId); ServiceResponse<WelcomeRemoveCheckDTO> removeWelcomeWithErrorInfo(String welcomeId);
/**
* 欢迎语被引用统计
* @param welcomeId
* @return
*/
ServiceResponse<WelcomeRemoveCheckDTO> welcomeReferStatistics(String welcomeId);
} }
haoban-manage3-operation-web/src/main/webapp/WEB-INF/applicationContext-conf.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd"> http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="classpath*:gic-haoban-init.xml" /> <import resource="classpath*:gic-haoban-init.xml" />
<import resource="dubbo-haoban-manage3-operation-web.xml"/> <import resource="dubbo-haoban-manage3-operation-web.xml"/>
<import resource="classpath*:dubbo-setting.xml"/> <import resource="classpath*:dubbo-setting.xml"/>
<import resource="classpath*:redis-init.xml"/> <import resource="classpath*:redis-init.xml"/>
<import resource="redis-session.xml"/> <import resource="redis-session.xml"/>
</beans> </beans>
haoban-manage3-operation-web/src/main/webapp/WEB-INF/redis-session.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:util="http://www.springframework.org/schema/util" xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-4.1.xsd"> http://www.springframework.org/schema/util/spring-util-4.1.xsd">
<util:constant static-field="org.springframework.session.data.redis.config.ConfigureRedisAction.NO_OP"/> <util:constant static-field="org.springframework.session.data.redis.config.ConfigureRedisAction.NO_OP"/>
<bean id="redisHttpSessionConfiguration" <bean id="redisHttpSessionConfiguration"
class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"> class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration">
<property name="maxInactiveIntervalInSeconds" value="1800"/> <property name="maxInactiveIntervalInSeconds" value="1800"/>
<property name="cookieSerializer" ref="defaultCookieSerializer"/> <property name="cookieSerializer" ref="defaultCookieSerializer"/>
</bean> </bean>
<bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig"> <bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig">
<property name="maxTotal" value="100"/> <property name="maxTotal" value="100"/>
<property name="maxIdle" value="10"/> <property name="maxIdle" value="10"/>
</bean> </bean>
<bean id="jedisConnectionFactory" <bean id="jedisConnectionFactory"
class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" destroy-method="destroy"> class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" destroy-method="destroy">
<property name="hostName" value="${redis.host}"/> <property name="hostName" value="${redis.host}"/>
<property name="port" value="${redis.port}"/> <property name="port" value="${redis.port}"/>
<property name="password" value="${redis.password}"/> <property name="password" value="${redis.password}"/>
<property name="timeout" value="3000"/> <property name="timeout" value="3000"/>
<property name="usePool" value="true"/> <property name="usePool" value="true"/>
<property name="poolConfig" ref="jedisPoolConfig"/> <property name="poolConfig" ref="jedisPoolConfig"/>
<property name="database" value="${redis.database}"/> <property name="database" value="${redis.database}"/>
</bean> </bean>
<bean id="defaultCookieSerializer" class="org.springframework.session.web.http.DefaultCookieSerializer"> <bean id="defaultCookieSerializer" class="org.springframework.session.web.http.DefaultCookieSerializer">
<property name="cookieName" value="customSessionId"/> <property name="cookieName" value="customSessionId"/>
<property name="cookiePath" value="/"></property> <property name="cookiePath" value="/"></property>
</bean> </bean>
</beans> </beans>
\ No newline at end of file
haoban-manage3-operation-web/src/main/webapp/WEB-INF/web.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>Archetype Created Web Application</display-name> <display-name>Archetype Created Web Application</display-name>
<context-param> <context-param>
<param-name>contextConfigLocation</param-name> <param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext-conf.xml</param-value> <param-value>/WEB-INF/applicationContext-conf.xml</param-value>
</context-param> </context-param>
<listener> <listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener> </listener>
<listener> <listener>
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class> <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener> </listener>
<servlet> <servlet>
<servlet-name>spring</servlet-name> <servlet-name>spring</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param> <init-param>
<param-name>contextConfigLocation</param-name> <param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/spring-*.xml</param-value> <param-value>/WEB-INF/spring-*.xml</param-value>
</init-param> </init-param>
<load-on-startup>2</load-on-startup> <load-on-startup>2</load-on-startup>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>spring</servlet-name> <servlet-name>spring</servlet-name>
<url-pattern>/</url-pattern> <url-pattern>/</url-pattern>
</servlet-mapping> </servlet-mapping>
<filter> <filter>
<filter-name>encodingFilter</filter-name> <filter-name>encodingFilter</filter-name>
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class> <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
<init-param> <init-param>
<param-name>encoding</param-name> <param-name>encoding</param-name>
<param-value>utf-8</param-value> <param-value>utf-8</param-value>
</init-param> </init-param>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>encodingFilter</filter-name> <filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
<filter> <filter>
<filter-name>springSessionRepositoryFilter</filter-name> <filter-name>springSessionRepositoryFilter</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>springSessionRepositoryFilter</filter-name> <filter-name>springSessionRepositoryFilter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
</web-app> </web-app>
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/HmLinkMapper.java
...@@ -39,6 +39,18 @@ public interface HmLinkMapper { ...@@ -39,6 +39,18 @@ public interface HmLinkMapper {
* @Throws * @Throws
*/ */
public TabHmLink selectById(Long linkId); public TabHmLink selectById(Long linkId);
/**
*
* @Title: selectByShortCode
* @Description: 通过短code查询
* @author xugh
* @param enterpriseId
* @param shortCode
* @return
* @throws
*/
public TabHmLink selectByShortCode(String enterpriseId, String shortCode) ;
public List<TabHmLink> listForSms(@Param("wxEnterpriseId") String wxEnterpriseId, public List<TabHmLink> listForSms(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("linkName") String linkName, @Param("enterpriseId") String enterpriseId, @Param("linkName") String linkName,
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/WxUserAddLogMapper.java
...@@ -24,13 +24,26 @@ public interface WxUserAddLogMapper { ...@@ -24,13 +24,26 @@ public interface WxUserAddLogMapper {
public int insert(TabWxUserAddLog entity); public int insert(TabWxUserAddLog entity);
/** /**
* 通过条件查询 *
* @Title: listAll * @Title: listAllForDel
* @Description: TODO * @Description: TODO(这里用一句话描述这个方法的作用)
* @Param @param TabHaobanWxUserAddLog * @author xugh
* @Param @return * @param externalUserid
* @Return List * @return
* @Throws * @throws
*/
public List<TabWxUserAddLog> listAllForDel(String externalUserid);
/**
*
* @Title: selectNewLog
* @Description: 查询外部联系人最新添加的好友记录
* @author xugh
* @param externalUserid
* @param wxUserId
* @return
* @throws
*/ */
public List<TabWxUserAddLog> listAll(TabWxUserAddLog tabHaobanWxUserAddLog); public TabWxUserAddLog selectNewLog(String externalUserid, String wxUserId);
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHmLink.java
...@@ -16,6 +16,7 @@ public class TabHmLink implements Serializable { ...@@ -16,6 +16,7 @@ public class TabHmLink implements Serializable {
private static final long serialVersionUID = 1967119533845800L; private static final long serialVersionUID = 1967119533845800L;
private Long linkId; private Long linkId;
private String shortCode ;
private String linkCode; private String linkCode;
/**1通用链接 2专用链接*/ /**1通用链接 2专用链接*/
private Integer linkType; private Integer linkType;
...@@ -40,6 +41,14 @@ public class TabHmLink implements Serializable { ...@@ -40,6 +41,14 @@ public class TabHmLink implements Serializable {
/**0删除 1正常*/ /**0删除 1正常*/
private Integer statusFlag; private Integer statusFlag;
public String getShortCode() {
return shortCode;
}
public void setShortCode(String shortCode) {
this.shortCode = shortCode;
}
public void setLinkId(Long linkId) { public void setLinkId(Long linkId) {
this.linkId = linkId; this.linkId = linkId;
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmGroupRelationBO.java
...@@ -11,6 +11,8 @@ import java.io.Serializable; ...@@ -11,6 +11,8 @@ import java.io.Serializable;
public class HmGroupRelationBO implements Serializable { public class HmGroupRelationBO implements Serializable {
private static final long serialVersionUID = 777099918625753950L;
private Long groupId; private Long groupId;
private Integer changeCount; private Integer changeCount;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmGroupSettingBO.java 0 → 100644
package com.gic.haoban.manage.service.pojo.bo.hm;
import java.io.Serializable;
import java.util.Date;
/**
* @Author MUSI
* @Date 2022/7/9 6:39 AM
* @Description
* @Version
**/
public class HmGroupSettingBO implements Serializable {
private static final long serialVersionUID = 8357992629261773954L;
private Long groupId;
private String groupName;
private String enterpriseId;
private String wxEnterpriseId;
private Integer referNum;
private Integer status;
private Integer sort;
private String creatorId;
private String creatorName;
private String modifierId;
private Date createTime;
private Date updateTime;
private String modifierName;
/**
* 是否为默认分组
*/
private Integer defaultFlag;
public Long getGroupId() {
return groupId;
}
public void setGroupId(Long groupId) {
this.groupId = groupId;
}
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getReferNum() {
return referNum;
}
public void setReferNum(Integer referNum) {
this.referNum = referNum;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getSort() {
return sort;
}
public void setSort(Integer sort) {
this.sort = sort;
}
public String getCreatorId() {
return creatorId;
}
public void setCreatorId(String creatorId) {
this.creatorId = creatorId;
}
public String getCreatorName() {
return creatorName;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
public String getModifierId() {
return modifierId;
}
public void setModifierId(String modifierId) {
this.modifierId = modifierId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getModifierName() {
return modifierName;
}
public void setModifierName(String modifierName) {
this.modifierName = modifierName;
}
public Integer getDefaultFlag() {
return defaultFlag;
}
public void setDefaultFlag(Integer defaultFlag) {
this.defaultFlag = defaultFlag;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmPageBO.java
...@@ -11,6 +11,7 @@ import java.util.Date; ...@@ -11,6 +11,7 @@ import java.util.Date;
**/ **/
public class HmPageBO implements Serializable { public class HmPageBO implements Serializable {
private static final long serialVersionUID = -2930830291522139085L;
/** /**
* 落地页id * 落地页id
*/ */
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmPageRelationBO.java
package com.gic.haoban.manage.service.pojo.bo.hm; package com.gic.haoban.manage.service.pojo.bo.hm;
import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
import com.gic.haoban.manage.api.enums.hm.HmPageType;
import java.io.Serializable; import java.io.Serializable;
/** /**
...@@ -10,6 +13,7 @@ import java.io.Serializable; ...@@ -10,6 +13,7 @@ import java.io.Serializable;
**/ **/
public class HmPageRelationBO implements Serializable { public class HmPageRelationBO implements Serializable {
private static final long serialVersionUID = 4300459192830013417L;
/** /**
* 落地页模板code * 落地页模板code
*/ */
...@@ -39,13 +43,13 @@ public class HmPageRelationBO implements Serializable { ...@@ -39,13 +43,13 @@ public class HmPageRelationBO implements Serializable {
/** /**
* 引用方来源 * 引用方来源
* *
* @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateType * @see HmPageType
*/ */
private Integer type; private Integer type;
/** /**
* 关联状态 * 关联状态
* @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus * @see HmPageStatus
* *
*/ */
private Integer status; private Integer status;
...@@ -97,4 +101,12 @@ public class HmPageRelationBO implements Serializable { ...@@ -97,4 +101,12 @@ public class HmPageRelationBO implements Serializable {
public void setType(Integer type) { public void setType(Integer type) {
this.type = type; this.type = type;
} }
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmWelcomeRelationBO.java
package com.gic.haoban.manage.service.pojo.bo.hm; package com.gic.haoban.manage.service.pojo.bo.hm;
import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* @Author MUSI * @Author MUSI
...@@ -12,34 +11,30 @@ import java.io.Serializable; ...@@ -12,34 +11,30 @@ import java.io.Serializable;
**/ **/
public class HmWelcomeRelationBO implements Serializable { public class HmWelcomeRelationBO implements Serializable {
/** private static final long serialVersionUID = -5265091280402568359L;
* 企业id private Long relationId;
*/
private String enterpriseId; private String enterpriseId;
private String wxEnterpriseId; private String wxEnterpriseId;
/**
* 欢迎语id
*/
private String welcomeId; private String welcomeId;
/**
* 引用方code
*/
private String referId; private String referId;
/**
* 引用方名称
*/
private String referName; private String referName;
private Date createTime;
private Date updateTime;
/** /**
* 引用方类型 * @see com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType
* @see HmWelcomeReferType
*/ */
private Integer type; private Integer type;
private Integer status;
public String getEnterpriseId() { public String getEnterpriseId() {
return enterpriseId; return enterpriseId;
} }
...@@ -87,4 +82,36 @@ public class HmWelcomeRelationBO implements Serializable { ...@@ -87,4 +82,36 @@ public class HmWelcomeRelationBO implements Serializable {
public void setType(Integer type) { public void setType(Integer type) {
this.type = type; this.type = type;
} }
public Long getRelationId() {
return relationId;
}
public void setRelationId(Long relationId) {
this.relationId = relationId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/qo/HmPageTemplateQO.java
package com.gic.haoban.manage.service.pojo.qo; package com.gic.haoban.manage.service.pojo.qo;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
import java.util.Date; import java.util.Date;
...@@ -37,7 +38,7 @@ public class HmPageTemplateQO extends BasePageInfo { ...@@ -37,7 +38,7 @@ public class HmPageTemplateQO extends BasePageInfo {
private Date endTime; private Date endTime;
/** /**
* @see com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus * @see HmPageStatus
*/ */
private Integer status; private Integer status;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/qo/WelcomeRelationQO.java
...@@ -10,8 +10,11 @@ import com.gic.haoban.base.api.common.BasePageInfo; ...@@ -10,8 +10,11 @@ import com.gic.haoban.base.api.common.BasePageInfo;
**/ **/
public class WelcomeRelationQO extends BasePageInfo { public class WelcomeRelationQO extends BasePageInfo {
private static final long serialVersionUID = -2538708162030338593L;
private String welcomeId ; private String welcomeId ;
private Integer status;
public String getWelcomeId() { public String getWelcomeId() {
return welcomeId; return welcomeId;
} }
...@@ -19,4 +22,12 @@ public class WelcomeRelationQO extends BasePageInfo { ...@@ -19,4 +22,12 @@ public class WelcomeRelationQO extends BasePageInfo {
public void setWelcomeId(String welcomeId) { public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId; this.welcomeId = welcomeId;
} }
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WelcomeService.java
...@@ -2,7 +2,7 @@ package com.gic.haoban.manage.service.service; ...@@ -2,7 +2,7 @@ package com.gic.haoban.manage.service.service;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
import com.gic.haoban.manage.service.pojo.bo.welcome.*; import com.gic.haoban.manage.service.pojo.bo.welcome.*;
...@@ -142,5 +142,12 @@ public interface WelcomeService { ...@@ -142,5 +142,12 @@ public interface WelcomeService {
* @param welcomeId * @param welcomeId
* @return * @return
*/ */
WelcomeRemoveDTO removeWithErrorInfo(String welcomeId); WelcomeRemoveCheckDTO removeWithErrorInfo(String welcomeId);
/**
* 欢迎语引用情况统计
* @param welcomeId
* @return
*/
WelcomeRemoveCheckDTO welcomeReferStatistics(String welcomeId);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmGroupService.java
package com.gic.haoban.manage.service.service.hm; package com.gic.haoban.manage.service.service.hm;
import com.gic.api.base.commons.Page;
import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupRelationBO; import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupRelationBO;
import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupSettingBO;
import com.gic.haoban.manage.service.pojo.qo.HmGroupInfoQO;
import java.util.List; import java.util.List;
...@@ -28,4 +32,40 @@ public interface HmGroupService { ...@@ -28,4 +32,40 @@ public interface HmGroupService {
*/ */
Boolean batchUpdateGroupRelationCount(List<HmGroupRelationBO> groupRelations); Boolean batchUpdateGroupRelationCount(List<HmGroupRelationBO> groupRelations);
/**
* 查询分组被引用的次数
* @param enterpriseId
* @param wxEnterpriseId
* @return
*/
Integer queryGroupTotalReferCount(String enterpriseId, String wxEnterpriseId);
/**
* 删除分组
* @param groupDTO
*/
void deleteGroupSetting(HmGroupDTO groupDTO);
/**
* 查询分组详情
* @param groupId
* @return
*/
HmGroupSettingBO queryGroupSettingDetail(Long groupId);
/**
* 条件查询分组列表
* @param groupInfoQo
* @return
*/
Page<HmGroupSettingBO> queryGroupSettingList(HmGroupInfoQO groupInfoQo);
/**
* 保存分组
* @param groupDTO
* @return
*/
Long saveOrUpdateGroupSetting(HmGroupDTO groupDTO);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmLinkService.java
...@@ -12,6 +12,10 @@ import com.gic.haoban.manage.service.entity.hm.TabHmLink; ...@@ -12,6 +12,10 @@ import com.gic.haoban.manage.service.entity.hm.TabHmLink;
public interface HmLinkService { public interface HmLinkService {
public TabHmLink getByLinkId(String wxEnterpriseId, String enterprieId,Long linkId); public TabHmLink getByLinkId(String wxEnterpriseId, String enterprieId,Long linkId);
public TabHmLink getByLinkShortCode(String enterprieId,String shortCode);
public TabHmLink getByLinkIdFormCache(String wxEnterpriseId, String enterprieId,Long linkId);
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId, String linkName, Integer linkType); public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId, String linkName, Integer linkType);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmPageRelationService.java
...@@ -36,14 +36,14 @@ public interface HmPageRelationService { ...@@ -36,14 +36,14 @@ public interface HmPageRelationService {
* @param pageCode * @param pageCode
* @return * @return
*/ */
List<HmPageRelationBO> queryPageTemplateRelation(String pageCode); List<HmPageRelationBO> queryPageRelation(String pageCode);
/** /**
* 链接code/模板名称 条件查询 * 链接code/模板名称 条件查询
* @param hmPageRelationQo
* @return * @return
*/ */
Page<HmPageRelationBO> queryPageTemplateRelationWithSearchText(HmPageRelationQO hmPageRelationQo); Page<HmPageRelationBO> queryPageRelationWithSearchText(HmPageRelationQO hmPageRelationQo);
/** /**
* 统计templateCode 被引用的总数 * 统计templateCode 被引用的总数
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmPageService.java
package com.gic.haoban.manage.service.service.hm; package com.gic.haoban.manage.service.service.hm;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO; import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO; import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO; import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO;
...@@ -38,14 +38,14 @@ public interface HmPageService { ...@@ -38,14 +38,14 @@ public interface HmPageService {
/** /**
* 删除落地页模板 * 删除落地页模板
* @param pageTemplateDTO * @param pageDTO
*/ */
void deleteHmPageTemplate(HmPageTemplateDTO pageTemplateDTO); void deleteHmPage(HmPageDTO pageDTO);
/** /**
* 保存 * 保存
* @param pageTemplateDTO * @param pageDTO
* @return * @return
*/ */
Long saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO); Long saveOrUpdateHmPage(HmPageDTO pageDTO);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/WelcomeRelationService.java
package com.gic.haoban.manage.service.service.hm; package com.gic.haoban.manage.service.service.hm;
import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation; import com.gic.api.base.commons.Page;
import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO; import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
import java.util.List; import java.util.List;
...@@ -19,12 +20,19 @@ public interface WelcomeRelationService { ...@@ -19,12 +20,19 @@ public interface WelcomeRelationService {
* @param status * @param status
* @return * @return
*/ */
TabHaobanWelcomeTemplateRelation queryWelcomeRelation(String referId, Integer status); HmWelcomeRelationBO queryWelcomeRelation(String referId, Integer status);
/** /**
* 条件查询 欢迎语引用列表 * 条件查询 欢迎语引用列表
* @param welcomeRelationQo * @param welcomeRelationQo
* @return * @return
*/ */
List<TabHaobanWelcomeTemplateRelation> queryWelcomeRelationList(WelcomeRelationQO welcomeRelationQo); List<HmWelcomeRelationBO> queryWelcomeRelationList(WelcomeRelationQO welcomeRelationQo);
/**
* 分页查询 欢迎语关联列表
* @param welcomeRelationQo
* @return
*/
Page<HmWelcomeRelationBO> queryWelcomeRelationPage(WelcomeRelationQO welcomeRelationQo);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/WxUserAddLogService.java
package com.gic.haoban.manage.service.service.hm; package com.gic.haoban.manage.service.service.hm;
import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
/** /**
* *
* @ClassName: TabHaobanWxUserAddLogMapper * @ClassName: TabHaobanWxUserAddLogMapper
...@@ -11,4 +13,13 @@ package com.gic.haoban.manage.service.service.hm; ...@@ -11,4 +13,13 @@ package com.gic.haoban.manage.service.service.hm;
*/ */
public interface WxUserAddLogService { public interface WxUserAddLogService {
/**
*
* @Title: save
* @Description: 添加记录
* @author xugh
* @param qdto
* @throws
*/
public void save(WxUserAddLogQDTO qdto);
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmGroupServiceImpl.java
package com.gic.haoban.manage.service.service.hm.impl; package com.gic.haoban.manage.service.service.hm.impl;
import com.gic.api.base.commons.Page;
import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
import com.gic.haoban.manage.api.enums.hm.HmGroupStatus; import com.gic.haoban.manage.api.enums.hm.HmGroupStatus;
import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmGroupSettingMapper; import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmGroupSettingMapper;
import com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting; import com.gic.haoban.manage.service.entity.hm.TabHaobanHmGroupSetting;
import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupRelationBO; import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupRelationBO;
import com.gic.haoban.manage.service.pojo.bo.hm.HmGroupSettingBO;
import com.gic.haoban.manage.service.pojo.qo.HmGroupInfoQO;
import com.gic.haoban.manage.service.service.hm.HmGroupService; import com.gic.haoban.manage.service.service.hm.HmGroupService;
import com.github.pagehelper.PageHelper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -24,6 +36,9 @@ public class HmGroupServiceImpl implements HmGroupService { ...@@ -24,6 +36,9 @@ public class HmGroupServiceImpl implements HmGroupService {
private static final Logger log = LoggerFactory.getLogger(HmGroupServiceImpl.class); private static final Logger log = LoggerFactory.getLogger(HmGroupServiceImpl.class);
private static final Long DEFAULT_GROUP_ID = NumberUtils.LONG_ZERO;
private static final String DEFAULT_GROUP_NAME = "默认分组";
@Autowired @Autowired
private TabHaobanHmGroupSettingMapper haobanHmGroupSettingMapper; private TabHaobanHmGroupSettingMapper haobanHmGroupSettingMapper;
...@@ -45,4 +60,95 @@ public class HmGroupServiceImpl implements HmGroupService { ...@@ -45,4 +60,95 @@ public class HmGroupServiceImpl implements HmGroupService {
}); });
return null; return null;
} }
/**
* 查询分组被引用的次数
*
* @param enterpriseId
* @param wxEnterpriseId
* @return
*/
@Override
public Integer queryGroupTotalReferCount(String enterpriseId, String wxEnterpriseId) {
return 0;
}
/**
* 删除分组
*
* @param groupDTO
*/
@Override
public void deleteGroupSetting(HmGroupDTO groupDTO) {
TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
tempGroupSetting.setGroupId(groupDTO.getGroupId());
tempGroupSetting.setStatus(HmGroupStatus.DISABLE.getCode());
tempGroupSetting.setModifierId(groupDTO.getModifierId());
tempGroupSetting.setModifierName(groupDTO.getModifierName());
tempGroupSetting.setUpdateTime(new Date());
haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting);
}
/**
* 查询分组详情
*
* @param groupId
* @return
*/
@Override
public HmGroupSettingBO queryGroupSettingDetail(Long groupId) {
TabHaobanHmGroupSetting tabHaobanHmGroupSetting = haobanHmGroupSettingMapper.selectByPrimaryKey(groupId);
if (tabHaobanHmGroupSetting == null){
return null;
}
HmGroupSettingBO groupSettingBo = new HmGroupSettingBO();
BeanUtils.copyProperties(tabHaobanHmGroupSetting, groupSettingBo);
return groupSettingBo;
}
/**
* 条件查询分组列表
*
* @param groupInfoQo
* @return
*/
@Override
public Page<HmGroupSettingBO> queryGroupSettingList(HmGroupInfoQO groupInfoQo) {
PageHelper.startPage(groupInfoQo.getPageNum(), groupInfoQo.getPageSize());
com.github.pagehelper.Page<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings =
(com.github.pagehelper.Page<TabHaobanHmGroupSetting>) haobanHmGroupSettingMapper.queryHmGroupSettingList(groupInfoQo);
return PageUtil.changePageHelperToCurrentPage(tabHaobanHmGroupSettings, HmGroupSettingBO.class);
}
/**
* 保存分组
*
* @param groupDTO
* @return
*/
@Override
public Long saveOrUpdateGroupSetting(HmGroupDTO groupDTO) {
if (groupDTO.getGroupId() == null) {
TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
tempGroupSetting.setGroupId(UniqueIdUtils.uniqueLong());
tempGroupSetting.setGroupName(groupDTO.getGroupName());
tempGroupSetting.setCreatorId(groupDTO.getCreatorId());
tempGroupSetting.setCreatorName(groupDTO.getCreatorName());
tempGroupSetting.setCreateTime(new Date());
tempGroupSetting.setStatus(HmGroupStatus.ENABLE.getCode());
tempGroupSetting.setEnterpriseId(groupDTO.getEnterpriseId());
tempGroupSetting.setWxEnterpriseId(groupDTO.getWxEnterpriseId());
haobanHmGroupSettingMapper.insertSelective(tempGroupSetting);
return tempGroupSetting.getGroupId();
}else {
TabHaobanHmGroupSetting tempGroupSetting = new TabHaobanHmGroupSetting();
tempGroupSetting.setGroupId(groupDTO.getGroupId());
tempGroupSetting.setGroupName(groupDTO.getGroupName());
tempGroupSetting.setModifierId(groupDTO.getModifierId());
tempGroupSetting.setModifierName(groupDTO.getModifierName());
tempGroupSetting.setUpdateTime(new Date());
haobanHmGroupSettingMapper.updateByPrimaryKeySelective(tempGroupSetting);
return tempGroupSetting.getGroupId();
}
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java
...@@ -3,6 +3,8 @@ package com.gic.haoban.manage.service.service.hm.impl; ...@@ -3,6 +3,8 @@ package com.gic.haoban.manage.service.service.hm.impl;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -11,6 +13,7 @@ import com.gic.api.base.commons.BasePageInfo; ...@@ -11,6 +13,7 @@ import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils; import com.gic.commons.util.PageHelperUtils;
import com.gic.commons.util.ToolUtil;
import com.gic.commons.util.UniqueIdUtils; import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.manage.api.dto.hm.HmLinkDTO; import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO; import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
...@@ -19,11 +22,19 @@ import com.gic.haoban.manage.service.dao.mapper.hm.HmLinkMapper; ...@@ -19,11 +22,19 @@ import com.gic.haoban.manage.service.dao.mapper.hm.HmLinkMapper;
import com.gic.haoban.manage.service.entity.hm.TabHmLink; import com.gic.haoban.manage.service.entity.hm.TabHmLink;
import com.gic.haoban.manage.service.service.hm.HmLinkService; import com.gic.haoban.manage.service.service.hm.HmLinkService;
import com.gic.haoban.manage.service.service.hm.HmLinkStoreService; import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
import com.gic.redis.data.util.RedisUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
@Service("hmLikService") @Service("hmLikService")
public class HmLinkServiceImpl implements HmLinkService { public class HmLinkServiceImpl implements HmLinkService {
private static final Logger log = LoggerFactory.getLogger(HmLinkService.class);
public static String[] PADDING = new String[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C",
"D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X",
"Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
"t", "u", "v", "w", "x", "y", "z" };
@Autowired @Autowired
private HmLinkMapper linkMapper; private HmLinkMapper linkMapper;
@Autowired @Autowired
...@@ -34,6 +45,25 @@ public class HmLinkServiceImpl implements HmLinkService { ...@@ -34,6 +45,25 @@ public class HmLinkServiceImpl implements HmLinkService {
TabHmLink link = this.linkMapper.selectById(linkId); TabHmLink link = this.linkMapper.selectById(linkId);
return link; return link;
} }
@Override
public TabHmLink getByLinkShortCode(String enterpriseId, String shortCode) {
TabHmLink link = this.linkMapper.selectByShortCode(enterpriseId, shortCode);
return link;
}
@Override
public TabHmLink getByLinkIdFormCache(String wxEnterpriseId, String enterprieId, Long linkId) {
String key = "hm:link:" + linkId;
TabHmLink link = RedisUtil.getCache(key, TabHmLink.class);
if (link == null) {
link = this.getByLinkId(wxEnterpriseId, enterprieId, linkId);
if (link != null) {
RedisUtil.setCache(key, link, 20 * 60L);
}
}
return link;
}
@Override @Override
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName, Integer linkType) { public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName, Integer linkType) {
...@@ -51,6 +81,8 @@ public class HmLinkServiceImpl implements HmLinkService { ...@@ -51,6 +81,8 @@ public class HmLinkServiceImpl implements HmLinkService {
StringBuilder sb = new StringBuilder("LJ").append("0").append(dto.getLinkType()).append(linkId); StringBuilder sb = new StringBuilder("LJ").append("0").append(dto.getLinkType()).append(linkId);
dto.setLinkId(linkId); dto.setLinkId(linkId);
dto.setLinkCode(sb.toString()); dto.setLinkCode(sb.toString());
String shortCode = shortCode(dto.getEnterpriseId());
dto.setShortCode(shortCode);
dto.setStatusFlag(1); dto.setStatusFlag(1);
TabHmLink entity = EntityUtil.changeEntityByJSON(TabHmLink.class, dto); TabHmLink entity = EntityUtil.changeEntityByJSON(TabHmLink.class, dto);
this.linkMapper.insert(entity); this.linkMapper.insert(entity);
...@@ -76,4 +108,29 @@ public class HmLinkServiceImpl implements HmLinkService { ...@@ -76,4 +108,29 @@ public class HmLinkServiceImpl implements HmLinkService {
return page; return page;
} }
public String shortCode(String enterpriseId) {
StringBuilder sb = new StringBuilder();
String uuid = ToolUtil.randomUUID();
int length = 5;
int totalLength = 62;
int interval = (int) (uuid.length() / length);
String str;
for (int i = 0; i < length; i++) {
if (i == length - 1) {
str = uuid.substring(length * interval);
} else {
str = uuid.substring(i * interval, i * interval + interval);
}
int x = Integer.parseInt(str, 16);
sb.append(PADDING[x % totalLength]);
}
sb.append(PADDING[(int) (Math.random() * totalLength)]);
String code = sb.toString();
TabHmLink link = this.linkMapper.selectByShortCode(enterpriseId, code) ;
if(null == link) {
return code ;
}
return shortCode(enterpriseId) ;
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmPageRelationServiceImpl.java
...@@ -2,8 +2,8 @@ package com.gic.haoban.manage.service.service.hm.impl; ...@@ -2,8 +2,8 @@ package com.gic.haoban.manage.service.service.hm.impl;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus; import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
import com.gic.haoban.manage.api.enums.hm.HmPageTemplateType; import com.gic.haoban.manage.api.enums.hm.HmPageType;
import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageRelationMapper; import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageRelationMapper;
import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation; import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation;
import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO; import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO;
...@@ -47,8 +47,8 @@ public class HmPageRelationServiceImpl implements HmPageRelationService { ...@@ -47,8 +47,8 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
pageRelation.setReferName(hmPageRelationBO.getReferName()); pageRelation.setReferName(hmPageRelationBO.getReferName());
pageRelation.setCreateTime(new Date()); pageRelation.setCreateTime(new Date());
pageRelation.setUpdateTime(new Date()); pageRelation.setUpdateTime(new Date());
pageRelation.setType(HmPageTemplateType.LINK.getCode()); pageRelation.setType(HmPageType.LINK.getCode());
pageRelation.setStatus(HmPageTemplateStatus.ENABLE.getCode()); pageRelation.setStatus(HmPageStatus.ENABLE.getCode());
return haobanHmPageRelationMapper.insertSelective(pageRelation) == 1; return haobanHmPageRelationMapper.insertSelective(pageRelation) == 1;
} }
...@@ -58,10 +58,10 @@ public class HmPageRelationServiceImpl implements HmPageRelationService { ...@@ -58,10 +58,10 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
} }
@Override @Override
public List<HmPageRelationBO> queryPageTemplateRelation(String pageCode) { public List<HmPageRelationBO> queryPageRelation(String pageCode) {
HmPageRelationQO hmPageRelationQo = new HmPageRelationQO(); HmPageRelationQO hmPageRelationQo = new HmPageRelationQO();
hmPageRelationQo.setPageCode(pageCode); hmPageRelationQo.setPageCode(pageCode);
hmPageRelationQo.setStatus(HmPageTemplateStatus.ENABLE.getCode()); hmPageRelationQo.setStatus(HmPageStatus.ENABLE.getCode());
hmPageRelationQo.setPageSize(1); hmPageRelationQo.setPageSize(1);
PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize()); PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize());
List<TabHaobanHmPageRelation> tabHaobanHmPageRelations = List<TabHaobanHmPageRelation> tabHaobanHmPageRelations =
...@@ -79,7 +79,7 @@ public class HmPageRelationServiceImpl implements HmPageRelationService { ...@@ -79,7 +79,7 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
* @return * @return
*/ */
@Override @Override
public Page<HmPageRelationBO> queryPageTemplateRelationWithSearchText(HmPageRelationQO hmPageRelationQo) { public Page<HmPageRelationBO> queryPageRelationWithSearchText(HmPageRelationQO hmPageRelationQo) {
PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize()); PageHelper.startPage(hmPageRelationQo.getPageNum(), hmPageRelationQo.getPageSize());
com.github.pagehelper.Page<TabHaobanHmPageRelation> pageRelationPage = com.github.pagehelper.Page<TabHaobanHmPageRelation> pageRelationPage =
(com.github.pagehelper.Page<TabHaobanHmPageRelation>) haobanHmPageRelationMapper.queryPageRelationList(hmPageRelationQo); (com.github.pagehelper.Page<TabHaobanHmPageRelation>) haobanHmPageRelationMapper.queryPageRelationList(hmPageRelationQo);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmPageServiceImpl.java
...@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON; ...@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.UniqueIdUtils; import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO; import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
import com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus; import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageMapper; import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmPageMapper;
import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage; import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage;
import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO; import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
...@@ -80,16 +80,16 @@ public class HmPageServiceImpl implements HmPageService { ...@@ -80,16 +80,16 @@ public class HmPageServiceImpl implements HmPageService {
/** /**
* 删除落地页模板 * 删除落地页模板
* *
* @param pageTemplateDTO * @param pageDTO
*/ */
@Override @Override
public void deleteHmPageTemplate(HmPageTemplateDTO pageTemplateDTO) { public void deleteHmPage(HmPageDTO pageDTO) {
TabHaobanHmPage tempHmPage = new TabHaobanHmPage(); TabHaobanHmPage tempHmPage = new TabHaobanHmPage();
tempHmPage.setPageId(pageTemplateDTO.getPageId()); tempHmPage.setPageId(pageDTO.getPageId());
tempHmPage.setStatus(HmPageTemplateStatus.DISABLE.getCode()); tempHmPage.setStatus(HmPageStatus.DISABLE.getCode());
tempHmPage.setUpdateTime(new Date()); tempHmPage.setUpdateTime(new Date());
tempHmPage.setModifierId(pageTemplateDTO.getClerkId()); tempHmPage.setModifierId(pageDTO.getModifierId());
tempHmPage.setModifierName(pageTemplateDTO.getClerkName()); tempHmPage.setModifierName(pageDTO.getModifierName());
log.info("[deleteHmPageTemplate] params:{}", JSON.toJSONString(tempHmPage)); log.info("[deleteHmPageTemplate] params:{}", JSON.toJSONString(tempHmPage));
haobanHmPageMapper.updateByPrimaryKeySelective(tempHmPage); haobanHmPageMapper.updateByPrimaryKeySelective(tempHmPage);
} }
...@@ -97,37 +97,37 @@ public class HmPageServiceImpl implements HmPageService { ...@@ -97,37 +97,37 @@ public class HmPageServiceImpl implements HmPageService {
/** /**
* 保存 * 保存
* *
* @param pageTemplateDTO * @param pageDTO
* @return * @return
*/ */
@Override @Override
public Long saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO) { public Long saveOrUpdateHmPage(HmPageDTO pageDTO) {
log.info("[saveOrUpdateHmPageTemplate] params:{}", JSON.toJSONString(pageTemplateDTO)); log.info("[saveOrUpdateHmPageTemplate] params:{}", JSON.toJSONString(pageDTO));
Date now = new Date(); Date now = new Date();
if (Objects.isNull(pageTemplateDTO.getPageId())) { if (Objects.isNull(pageDTO.getPageId())) {
// save // save
TabHaobanHmPage haobanHmPage = new TabHaobanHmPage(); TabHaobanHmPage haobanHmPage = new TabHaobanHmPage();
BeanUtils.copyProperties(pageTemplateDTO, haobanHmPage); BeanUtils.copyProperties(pageDTO, haobanHmPage);
haobanHmPage.setPageId(UniqueIdUtils.uniqueLong()); haobanHmPage.setPageId(UniqueIdUtils.uniqueLong());
haobanHmPage.setPageCode(this.generatorTemplateCode(haobanHmPage.getPageId())); haobanHmPage.setPageCode(this.generatorTemplateCode(haobanHmPage.getPageId()));
haobanHmPage.setCreateorId(pageTemplateDTO.getClerkId()); haobanHmPage.setCreateorId(pageDTO.getCreateorId());
haobanHmPage.setCreateorName(pageTemplateDTO.getClerkName()); haobanHmPage.setCreateorName(pageDTO.getCreateorName());
haobanHmPage.setCreateTime(now); haobanHmPage.setCreateTime(now);
haobanHmPage.setModifierId(pageTemplateDTO.getClerkId()); haobanHmPage.setModifierId(pageDTO.getCreateorId());
haobanHmPage.setModifierName(pageTemplateDTO.getClerkName()); haobanHmPage.setModifierName(pageDTO.getCreateorName());
haobanHmPage.setUpdateTime(now); haobanHmPage.setUpdateTime(now);
haobanHmPage.setStatus(HmPageTemplateStatus.ENABLE.getCode()); haobanHmPage.setStatus(HmPageStatus.ENABLE.getCode());
haobanHmPageMapper.insertSelective(haobanHmPage); haobanHmPageMapper.insertSelective(haobanHmPage);
return haobanHmPage.getPageId(); return haobanHmPage.getPageId();
} else { } else {
// update // update
TabHaobanHmPage haobanHmPage = new TabHaobanHmPage(); TabHaobanHmPage haobanHmPage = new TabHaobanHmPage();
BeanUtils.copyProperties(pageTemplateDTO, haobanHmPage); BeanUtils.copyProperties(pageDTO, haobanHmPage);
haobanHmPage.setPageId(pageTemplateDTO.getPageId()); haobanHmPage.setPageId(pageDTO.getPageId());
haobanHmPage.setPageCode(null); haobanHmPage.setPageCode(null);
haobanHmPage.setUpdateTime(now); haobanHmPage.setUpdateTime(now);
haobanHmPage.setModifierId(pageTemplateDTO.getClerkId()); haobanHmPage.setModifierId(pageDTO.getModifierId());
haobanHmPage.setModifierName(pageTemplateDTO.getClerkName()); haobanHmPage.setModifierName(pageDTO.getModifierName());
haobanHmPageMapper.updateByPrimaryKeySelective(haobanHmPage); haobanHmPageMapper.updateByPrimaryKeySelective(haobanHmPage);
return haobanHmPage.getPageId(); return haobanHmPage.getPageId();
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WelcomeRelationServiceImpl.java
package com.gic.haoban.manage.service.service.hm.impl; package com.gic.haoban.manage.service.service.hm.impl;
import com.gic.api.base.commons.Page;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper; import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper;
import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation; import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO; import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
import com.gic.haoban.manage.service.service.hm.WelcomeRelationService; import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
import com.github.pagehelper.PageHelper;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* @Author MUSI * @Author MUSI
...@@ -29,8 +37,14 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService { ...@@ -29,8 +37,14 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
* @return * @return
*/ */
@Override @Override
public TabHaobanWelcomeTemplateRelation queryWelcomeRelation(String referId, Integer status) { public HmWelcomeRelationBO queryWelcomeRelation(String referId, Integer status) {
return welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, status); TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, status);
if (welcomeTemplateRelation == null) {
return null;
}
HmWelcomeRelationBO welcomeRelationBo = new HmWelcomeRelationBO();
BeanUtils.copyProperties(welcomeTemplateRelation, welcomeRelationBo);
return welcomeRelationBo;
} }
/** /**
...@@ -40,7 +54,30 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService { ...@@ -40,7 +54,30 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
* @return * @return
*/ */
@Override @Override
public List<TabHaobanWelcomeTemplateRelation> queryWelcomeRelationList(WelcomeRelationQO welcomeRelationQo) { public List<HmWelcomeRelationBO> queryWelcomeRelationList(WelcomeRelationQO welcomeRelationQo) {
return welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo); List<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations = welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo);
if (CollectionUtils.isEmpty(tabHaobanWelcomeTemplateRelations)) {
return Collections.emptyList();
}
return tabHaobanWelcomeTemplateRelations.stream()
.map(item -> {
HmWelcomeRelationBO welcomeRelationBo = new HmWelcomeRelationBO();
BeanUtils.copyProperties(item, welcomeRelationBo);
return welcomeRelationBo;
}).collect(Collectors.toList());
}
/**
* 分页查询 欢迎语关联列表
*
* @param welcomeRelationQo
* @return
*/
@Override
public Page<HmWelcomeRelationBO> queryWelcomeRelationPage(WelcomeRelationQO welcomeRelationQo) {
PageHelper.startPage(welcomeRelationQo.getPageNum(), welcomeRelationQo.getPageSize());
com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations =
(com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation>) welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo);
return PageUtil.changePageHelperToCurrentPage(tabHaobanWelcomeTemplateRelations, HmWelcomeRelationBO.class);
} }
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WxUserAddLogServiceImpl.java
package com.gic.haoban.manage.service.service.hm.impl; package com.gic.haoban.manage.service.service.hm.impl;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONObject;
import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
import com.gic.haoban.manage.service.dao.mapper.hm.WxUserAddLogMapper;
import com.gic.haoban.manage.service.entity.hm.TabHmLink;
import com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog;
import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
import com.gic.haoban.manage.service.service.MemberQueryService;
import com.gic.haoban.manage.service.service.hm.HmLinkService;
import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
import com.gic.haoban.manage.service.service.hm.WxUserAddLogService; import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
import com.gic.member.api.dto.es.MemberDataDTO;
import com.gic.member.tag.api.dto.MemberTagItemDTO;
import com.gic.member.tag.api.service.MemberTagApiService;
@Service("wxUserAddLogService") @Service("wxUserAddLogService")
public class WxUserAddLogServiceImpl implements WxUserAddLogService { public class WxUserAddLogServiceImpl implements WxUserAddLogService {
private static final Logger log = LoggerFactory.getLogger(WxUserAddLogService.class);
@Autowired
private WxUserAddLogMapper wxUserAddLogMapper;
@Autowired
private HmLinkService hmLinkService;
@Autowired
private HmQrcodeService hmQrcodeService;
@Autowired
private MemberQueryService memberQueryService;
@Autowired
private MemberTagApiService memberTagApiService;
public void save(WxUserAddLogQDTO qdto) {
String externalUserid = qdto.getExternalUserid();
String wxUserId = qdto.getWxUserId();
TabWxUserAddLog entity = new TabWxUserAddLog();
entity.setWxEnterpriseId(qdto.getWxEnterpriseId());
entity.setEnterpriseId(qdto.getEnterpriseId());
entity.setExternalUserid(externalUserid);
entity.setAddChannel(0);
entity.setStatusFlag(1);
entity.setWxUserId(qdto.getWxUserId());
entity.setStaffId(qdto.getStaffId());
entity.setStaffName(qdto.getStaffName());
if (qdto.isDelFlag()) {
TabWxUserAddLog log = this.wxUserAddLogMapper.selectNewLog(externalUserid, wxUserId);
entity = log;
entity.setStatusFlag(2);
// 是否所有好友删除 1是0否
entity.setAllDelFlag(this.isAllDel(externalUserid));
}
// 新增好友
if (!qdto.isDelFlag()) {
String memberLabelId = null;
if (null != qdto.getHmId()) {
HmQrcodeBO hm = this.hmQrcodeService.queryById(qdto.getHmId());
entity.setAddChannel(2);
entity.setHmId(qdto.getHmId());
entity.setHmName(hm.getName());
entity.setClerkId(hm.getClerkId());
entity.setClerkCode(hm.getClerkCode());
entity.setClerkName(hm.getClerkName());
entity.setStoreId(hm.getStoreId());
entity.setStoreCode(hm.getStoreCode());
entity.setStoreName(hm.getStoreName());
memberLabelId = hm.getMemberLabelId();
}
if (null != qdto.getLinkId()) {
TabHmLink link = this.hmLinkService.getByLinkIdFormCache(qdto.getWxEnterpriseId(),
qdto.getEnterpriseId(), qdto.getLinkId());
entity.setAddChannel(1);
entity.setLinkId(qdto.getLinkId());
entity.setLinkName(link.getName());
memberLabelId = link.getMemberLabelId();
}
if (null != memberLabelId) {
entity.setMemberLabelId(memberLabelId);
MemberTagItemDTO dto = this.memberTagApiService.findMemberTagItem(memberLabelId);
if (null != dto) {
entity.setMemberName(dto.getTagName() + dto.getTagItemName());
}
}
if (null != qdto.getMemberId()) {
entity = this.addMemberInfo(qdto.getEnterpriseId(), qdto.getMemberId(), entity);
}
}
this.wxUserAddLogMapper.insert(entity);
}
// 冗余会员信息
private TabWxUserAddLog addMemberInfo(String enterpriseId, String memberId, TabWxUserAddLog entity) {
String returnFields = "memberId,photoUrl,name,nickName,cardNo,gradeId,gradeName,phoneNumber";
JSONObject memberObj = this.memberQueryService.queryDataSingle(enterpriseId, memberId, returnFields);
if (null == memberObj) {
return entity;
}
MemberDataDTO memberDataDTO = memberObj.toJavaObject(MemberDataDTO.class);
entity.setMemberId(memberId);
entity.setMemberName(memberDataDTO.getName());
entity.setMemberNick(memberDataDTO.getNickName());
entity.setMemberImage(memberDataDTO.getPhotoUrl());
entity.setMemberPhone(memberDataDTO.getPhoneNumber());
entity.setMemberGradeId(memberDataDTO.getGradeId());
entity.setMemberGradeName(memberDataDTO.getGradeName());
entity.setMemberCardNo(memberDataDTO.getCardNo());
return entity;
}
private int isAllDel(String externalUserid) {
List<TabWxUserAddLog> list = this.wxUserAddLogMapper.listAllForDel(externalUserid);
Map<String, List<TabWxUserAddLog>> map = list.stream()
.collect(Collectors.groupingBy(TabWxUserAddLog::getWxUserId));
Set<String> set = map.keySet();
Iterator<String> it = set.iterator();
boolean exist = false;
while (it.hasNext()) {
String wxUserId = it.next();
List<TabWxUserAddLog> itemList = map.get(wxUserId);
if (itemList.size() == 1 && itemList.get(0).getStatusFlag() == 2) {
log.info("成员={}只有1条删除的记录", wxUserId);
} else {
TabWxUserAddLog addLog = itemList.get(0);
if (addLog.getStatusFlag() == 1) {
log.info("成员={}最新是添加记录", wxUserId);
if (addLog.getWxUserId().equals(wxUserId)) {
log.info("成员={}本次删除", wxUserId);
} else {
exist = true;
}
} else {
log.info("成员={}最新是删除记录", wxUserId);
}
}
}
if (exist) {
return 0;
}
return 1;
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/KeyDataServiceImpl.java
package com.gic.haoban.manage.service.service.impl; package com.gic.haoban.manage.service.service.impl;
import java.util.Date; import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -10,7 +8,6 @@ import org.springframework.stereotype.Service; ...@@ -10,7 +8,6 @@ import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.ToolUtil;
import com.gic.commons.util.UniqueIdUtils; import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.manage.api.dto.KeyDataDTO; import com.gic.haoban.manage.api.dto.KeyDataDTO;
import com.gic.haoban.manage.api.enums.KeyDataEnum; import com.gic.haoban.manage.api.enums.KeyDataEnum;
...@@ -21,20 +18,15 @@ import com.gic.haoban.manage.service.service.KeyDataService; ...@@ -21,20 +18,15 @@ import com.gic.haoban.manage.service.service.KeyDataService;
@Service("keyDataService") @Service("keyDataService")
public class KeyDataServiceImpl implements KeyDataService { public class KeyDataServiceImpl implements KeyDataService {
public static String[] PADDING = new String[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C",
"D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X",
"Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
"t", "u", "v", "w", "x", "y", "z" };
@Autowired @Autowired
private TabKeyDataMapper tabKeyDataMapper; private TabKeyDataMapper tabKeyDataMapper;
@Override @Override
public KeyDataDTO saveData(String enterpriseId , String relationId , String data, KeyDataEnum dataEnum) { public KeyDataDTO saveData(String enterpriseId, String relationId, String data, KeyDataEnum dataEnum) {
KeyDataDTO dto = new KeyDataDTO(); KeyDataDTO dto = new KeyDataDTO();
dto.setRelationId(relationId); dto.setRelationId(relationId);
dto.setEnterpriseId(enterpriseId); dto.setEnterpriseId(enterpriseId);
dto.setDataKey(generateKey(dataEnum)); dto.setDataKey(generateKey(dataEnum, data));
dto.setCreateTime(new Date()); dto.setCreateTime(new Date());
dto.setId(UniqueIdUtils.uniqueLong()); dto.setId(UniqueIdUtils.uniqueLong());
dto.setData(data); dto.setData(data);
...@@ -43,64 +35,41 @@ public class KeyDataServiceImpl implements KeyDataService { ...@@ -43,64 +35,41 @@ public class KeyDataServiceImpl implements KeyDataService {
this.tabKeyDataMapper.insert(entity); this.tabKeyDataMapper.insert(entity);
return dto; return dto;
} }
@Override @Override
public String saveHmData(String enterpriseId , String unionid, Long linkId, Long hmId) { public String saveHmData(String enterpriseId, String unionid, Long linkId, Long hmId) {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("unid", unionid); json.put("unid", unionid);
json.put("ljid", linkId); json.put("ljid", linkId);
json.put("hmid", hmId); json.put("hmid", hmId);
KeyDataDTO data = this.saveData(enterpriseId,String.valueOf(linkId), json.toString(), KeyDataEnum.DYNAMIC_HM); KeyDataDTO data = this.saveData(enterpriseId, String.valueOf(linkId), json.toString(), KeyDataEnum.DYNAMIC_HM);
return data.getDataKey(); return data.getDataKey();
} }
@Override @Override
public KeyDataDTO getDataByKey(String key, KeyDataEnum dataEnum , String relationId) { public KeyDataDTO getDataByKey(String key, KeyDataEnum dataEnum, String relationId) {
TabKeyData tab = this.tabKeyDataMapper.selectByKey(key, dataEnum.getType() ,relationId); TabKeyData tab = this.tabKeyDataMapper.selectByKey(key, dataEnum.getType(), relationId);
if (null != tab) { if (null != tab) {
return EntityUtil.changeEntityByJSON(KeyDataDTO.class, tab); return EntityUtil.changeEntityByJSON(KeyDataDTO.class, tab);
} }
return null; return null;
} }
@Override @Override
public String getMobile(String key, String relationId) { public String getMobile(String key, String relationId) {
KeyDataDTO data = this.getDataByKey(key, KeyDataEnum.MOBILE, relationId) ; KeyDataDTO data = this.getDataByKey(key, KeyDataEnum.MOBILE, relationId);
if(null != data) { if (null != data) {
return JSON.parseObject(data.getData()).getString("ph") ; return JSON.parseObject(data.getData()).getString("ph");
} }
return null; return null;
} }
public static String generateKey(KeyDataEnum dataEnum) { public static String generateKey(KeyDataEnum dataEnum, String data) {
if (dataEnum.equals(KeyDataEnum.MOBILE)) { if (dataEnum.equals(KeyDataEnum.MOBILE)) {
StringBuilder sb = new StringBuilder(); String phone = JSON.parseObject(data).getString("ph");
String uuid = ToolUtil.randomUUID(); return Long.toHexString(Long.valueOf(phone));
int length = 6;
int interval = (int) (uuid.length() / length);
String str;
for (int i = 0; i < length; i++) {
if (i == length - 1) {
str = uuid.substring(length * interval);
} else {
str = uuid.substring(i * interval, i * interval + interval);
}
int x = Integer.parseInt(str, 16);
sb.append(PADDING[x % 62]);
}
sb.append(PADDING[(int) (Math.random() * 62)]);
return sb.toString();
} }
return UniqueIdUtils.uniqueLongHex(); return UniqueIdUtils.uniqueLongHex();
} }
public static void main(String[] args) {
Set<String> set = new HashSet<>();
for (int i = 0; i < 1000000; i++) {
String s = generateKey(KeyDataEnum.MOBILE);
set.add(s);
}
System.out.println(set.size());
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java
...@@ -3,7 +3,7 @@ package com.gic.haoban.manage.service.service.impl; ...@@ -3,7 +3,7 @@ package com.gic.haoban.manage.service.service.impl;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.UniqueIdUtils; import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.common.utils.StringUtil; import com.gic.haoban.common.utils.StringUtil;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
import com.gic.haoban.manage.api.enums.FriendSettingTypeEnum; import com.gic.haoban.manage.api.enums.FriendSettingTypeEnum;
import com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum; import com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum;
...@@ -13,7 +13,7 @@ import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType; ...@@ -13,7 +13,7 @@ import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
import com.gic.haoban.manage.api.enums.hm.HmWelcomeType; import com.gic.haoban.manage.api.enums.hm.HmWelcomeType;
import com.gic.haoban.manage.service.dao.mapper.*; import com.gic.haoban.manage.service.dao.mapper.*;
import com.gic.haoban.manage.service.entity.*; import com.gic.haoban.manage.service.entity.*;
import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation; import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
import com.gic.haoban.manage.service.pojo.bo.welcome.*; import com.gic.haoban.manage.service.pojo.bo.welcome.*;
import com.gic.haoban.manage.service.pojo.qo.WelcomeInfoQO; import com.gic.haoban.manage.service.pojo.qo.WelcomeInfoQO;
import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO; import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
...@@ -637,12 +637,12 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -637,12 +637,12 @@ public class WelcomeServiceImpl implements WelcomeService {
logger.info("[getMatchWelcomeWithReferId] staffId:{}, wxEnterpriseId:{}, referId:{}", logger.info("[getMatchWelcomeWithReferId] staffId:{}, wxEnterpriseId:{}, referId:{}",
staffId, wxEnterpriseId, referId); staffId, wxEnterpriseId, referId);
// 根据referId 查询 关联关系表 // 根据referId 查询 关联关系表
TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeRelationService.queryWelcomeRelation(referId, WelcomeRelationStatusEnum.ENABLE.getCode()); HmWelcomeRelationBO welcomeRelationBO = welcomeRelationService.queryWelcomeRelation(referId, WelcomeRelationStatusEnum.ENABLE.getCode());
if (welcomeTemplateRelation == null){ if (welcomeRelationBO == null){
// 不存在 // 不存在
return null; return null;
} }
TabWelcome tabWelcome = welcomeMapper.selectByPrimaryKey(welcomeTemplateRelation.getWelcomeId()); TabWelcome tabWelcome = welcomeMapper.selectByPrimaryKey(welcomeRelationBO.getWelcomeId());
return convertWelcomeToBo(tabWelcome); return convertWelcomeToBo(tabWelcome);
} }
...@@ -655,7 +655,7 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -655,7 +655,7 @@ public class WelcomeServiceImpl implements WelcomeService {
* 不可删除时 返回具体的关联数量 * 不可删除时 返回具体的关联数量
*/ */
@Override @Override
public WelcomeRemoveDTO removeWithErrorInfo(String welcomeId) { public WelcomeRemoveCheckDTO removeWithErrorInfo(String welcomeId) {
// 1、查询欢迎语 // 1、查询欢迎语
// 2、根据欢迎语类型 区分 // 2、根据欢迎语类型 区分
// 3、特殊类型 查询欢迎语引用的数量 // 3、特殊类型 查询欢迎语引用的数量
...@@ -668,20 +668,37 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -668,20 +668,37 @@ public class WelcomeServiceImpl implements WelcomeService {
this.removeWelcome(welcomeId); this.removeWelcome(welcomeId);
return null; return null;
} }
WelcomeRemoveCheckDTO welcomeRemoveCheckDTO = this.welcomeReferStatistics(welcomeId);
if (welcomeRemoveCheckDTO == null){
this.removeWelcome(welcomeId);
return null;
}
return welcomeRemoveCheckDTO;
}
/**
* 欢迎语引用情况统计
*
* @param welcomeId
* @return
*/
@Override
public WelcomeRemoveCheckDTO welcomeReferStatistics(String welcomeId) {
WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO(); WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
welcomeRelationQo.setWelcomeId(welcomeId); welcomeRelationQo.setWelcomeId(welcomeId);
List<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations = welcomeRelationService.queryWelcomeRelationList(welcomeRelationQo); welcomeRelationQo.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
if (CollectionUtils.isEmpty(tabHaobanWelcomeTemplateRelations)){ List<HmWelcomeRelationBO> hmWelcomeRelationBos = welcomeRelationService.queryWelcomeRelationList(welcomeRelationQo);
this.removeWelcome(welcomeId); if (CollectionUtils.isEmpty(hmWelcomeRelationBos)){
return null; return null;
} }
Map<Integer, List<TabHaobanWelcomeTemplateRelation>> welcomeGroupByType = tabHaobanWelcomeTemplateRelations.stream() Map<Integer, List<HmWelcomeRelationBO>> welcomeGroupByType = hmWelcomeRelationBos.stream()
.collect(Collectors.groupingBy(TabHaobanWelcomeTemplateRelation::getType)); .collect(Collectors.groupingBy(HmWelcomeRelationBO::getType));
WelcomeRemoveDTO welcomeRemoveDTO = new WelcomeRemoveDTO(); WelcomeRemoveCheckDTO welcomeRemoveCheckDTO = new WelcomeRemoveCheckDTO();
welcomeRemoveDTO.setQrCodeReferNum(Optional.ofNullable(welcomeGroupByType.get(HmWelcomeReferType.HM.getCode())) welcomeRemoveCheckDTO.setQrCodeReferNum(Optional.ofNullable(welcomeGroupByType.get(HmWelcomeReferType.HM.getCode()))
.map(List::size).orElse(0)); .map(List::size).orElse(0));
welcomeRemoveDTO.setLinkReferNum(Optional.ofNullable(welcomeGroupByType.get(HmWelcomeReferType.LINK.getCode())) welcomeRemoveCheckDTO.setLinkReferNum(Optional.ofNullable(welcomeGroupByType.get(HmWelcomeReferType.LINK.getCode()))
.map(List::size).orElse(0)); .map(List::size).orElse(0));
return welcomeRemoveDTO; return welcomeRemoveCheckDTO;
} }
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WelcomeApiServiceImpl.java
...@@ -7,7 +7,7 @@ import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO; ...@@ -7,7 +7,7 @@ import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeMediaDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeMediaDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeSuitDepartmentDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeSuitDepartmentDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
...@@ -60,6 +60,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService { ...@@ -60,6 +60,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
saveWelcomeBO.setCreatorName(qdto.getCreatorName()); saveWelcomeBO.setCreatorName(qdto.getCreatorName());
saveWelcomeBO.setModifierId(qdto.getModifierId()); saveWelcomeBO.setModifierId(qdto.getModifierId());
saveWelcomeBO.setModifierName(qdto.getModifierName()); saveWelcomeBO.setModifierName(qdto.getModifierName());
saveWelcomeBO.setType(qdto.getType());
// 媒体列表 // 媒体列表
saveWelcomeBO.setWelcomeMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaBO.class, qdto.getWelcomeMediaList())); saveWelcomeBO.setWelcomeMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaBO.class, qdto.getWelcomeMediaList()));
// 适用部门新增列表 // 适用部门新增列表
...@@ -189,7 +190,18 @@ public class WelcomeApiServiceImpl implements WelcomeApiService { ...@@ -189,7 +190,18 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
* @return * @return
*/ */
@Override @Override
public ServiceResponse<WelcomeRemoveDTO> removeWelcomeWithErrorInfo(String welcomeId) { public ServiceResponse<WelcomeRemoveCheckDTO> removeWelcomeWithErrorInfo(String welcomeId) {
return ServiceResponse.success(welcomeService.removeWithErrorInfo(welcomeId)); return ServiceResponse.success(welcomeService.removeWithErrorInfo(welcomeId));
} }
/**
* 欢迎语被引用统计
*
* @param welcomeId
* @return
*/
@Override
public ServiceResponse<WelcomeRemoveCheckDTO> welcomeReferStatistics(String welcomeId) {
return ServiceResponse.success(welcomeService.welcomeReferStatistics(welcomeId));
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmPageTemplateApiServiceImpl.java → haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmPageApiServiceImpl.java
...@@ -4,13 +4,12 @@ import com.gic.api.base.commons.Page; ...@@ -4,13 +4,12 @@ import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon; import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.hm.HmPageQueryDTO; import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationQueryDTO; import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationRespDTO; import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO; import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO; import com.gic.haoban.manage.api.enums.hm.HmPageStatus;
import com.gic.haoban.manage.api.enums.hm.HmPageTemplateStatus; import com.gic.haoban.manage.api.service.hm.HmPageApiService;
import com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService;
import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO; import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO; import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO;
import com.gic.haoban.manage.service.pojo.qo.HmPageRelationQO; import com.gic.haoban.manage.service.pojo.qo.HmPageRelationQO;
...@@ -35,11 +34,9 @@ import java.util.Objects; ...@@ -35,11 +34,9 @@ import java.util.Objects;
* @Version * @Version
**/ **/
@Component(value = "hmPageTemplateApiServiceImpl") @Component(value = "hmPageTemplateApiServiceImpl")
public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService { public class HmPageApiServiceImpl implements HmPageApiService {
private static final Logger log = LoggerFactory.getLogger(HmPageTemplateApiServiceImpl.class); private static final Logger log = LoggerFactory.getLogger(HmPageApiServiceImpl.class);
private static final String TEMPLATE_CODE_PREFIX = "MB01";
@Autowired @Autowired
private HmPageRelationService pageRelationService; private HmPageRelationService pageRelationService;
...@@ -47,61 +44,61 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService { ...@@ -47,61 +44,61 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
private HmPageService haobanHmPageService; private HmPageService haobanHmPageService;
@Override @Override
public ServiceResponse<Long> saveOrUpdateHmPageTemplate(HmPageTemplateDTO pageTemplateDTO) { public ServiceResponse<Long> saveOrUpdateHmPage(HmPageDTO pageDTO) {
if (Objects.nonNull(pageTemplateDTO.getPageId())) { if (Objects.nonNull(pageDTO.getPageId())) {
// update // update
HmPageBO pageDetail = haobanHmPageService.queryHmPageDetail(pageTemplateDTO.getPageId()); HmPageBO pageDetail = haobanHmPageService.queryHmPageDetail(pageDTO.getPageId());
if (Objects.isNull(pageDetail)) { if (Objects.isNull(pageDetail)) {
// 数据不存在 // 数据不存在
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg()); return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());
} }
if (!StringUtils.equals(pageDetail.getEnterpriseId(), pageTemplateDTO.getEnterpriseId())) { if (!StringUtils.equals(pageDetail.getEnterpriseId(), pageDTO.getEnterpriseId())) {
// 无权限 // 无权限
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg()); return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
} }
if (!StringUtils.equals(pageDetail.getWxEnterpriseId(), pageTemplateDTO.getWxEnterpriseId())) { if (!StringUtils.equals(pageDetail.getWxEnterpriseId(), pageDTO.getWxEnterpriseId())) {
// 无权限 // 无权限
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg()); return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
} }
} }
return ServiceResponse.success(haobanHmPageService.saveOrUpdateHmPageTemplate(pageTemplateDTO)); return ServiceResponse.success(haobanHmPageService.saveOrUpdateHmPage(pageDTO));
} }
@Override @Override
@Transactional(rollbackFor = RuntimeException.class) @Transactional(rollbackFor = RuntimeException.class)
public ServiceResponse<Boolean> deleteHmPageTemplate(HmPageTemplateDTO pageTemplateDTO) { public ServiceResponse<Boolean> deleteHmPage(HmPageDTO pageDTO) {
HmPageBO pageBo = haobanHmPageService.queryHmPageDetail(pageTemplateDTO.getPageId()); HmPageBO pageBo = haobanHmPageService.queryHmPageDetail(pageDTO.getPageId());
if (Objects.isNull(pageBo) || !Objects.equals(HmPageTemplateStatus.ENABLE.getCode(), pageBo.getStatus())) { if (Objects.isNull(pageBo) || !Objects.equals(HmPageStatus.ENABLE.getCode(), pageBo.getStatus())) {
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg()); return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());
} }
if (this.checkPageIsBeQuoted(pageBo.getPageCode()) > 0) { if (this.checkPageIsBeQuoted(pageBo.getPageCode()) > 0) {
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg()); return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", HaoBanErrCodeCommon.ERR_9.getMsg());
} }
haobanHmPageService.deleteHmPageTemplate(pageTemplateDTO); haobanHmPageService.deleteHmPage(pageDTO);
return ServiceResponse.success(Boolean.TRUE); return ServiceResponse.success(Boolean.TRUE);
} }
@Override @Override
public ServiceResponse<Page<HmPageTemplateRespDTO>> queryPageTemplateList(HmPageQueryDTO pageQueryDTO) { public ServiceResponse<Page<HmPageDTO>> queryPageList(HmPageQDTO pageQueryDTO) {
HmPageTemplateQO pageTemplateQo = new HmPageTemplateQO(); HmPageTemplateQO pageTemplateQo = new HmPageTemplateQO();
BeanUtils.copyProperties(pageQueryDTO, pageTemplateQo); BeanUtils.copyProperties(pageQueryDTO, pageTemplateQo);
pageTemplateQo.setStatus(HmPageTemplateStatus.ENABLE.getCode()); pageTemplateQo.setStatus(HmPageStatus.ENABLE.getCode());
Page<HmPageBO> hmPageBoPages = haobanHmPageService.queryPageList(pageTemplateQo); Page<HmPageBO> hmPageBoPages = haobanHmPageService.queryPageList(pageTemplateQo);
Page<HmPageTemplateRespDTO> pageRespVos = PageUtil.changeToCurrentPage(hmPageBoPages, HmPageTemplateRespDTO.class); Page<HmPageDTO> pageRespVos = PageUtil.changeToCurrentPage(hmPageBoPages, HmPageDTO.class);
return ServiceResponse.success(pageRespVos); return ServiceResponse.success(pageRespVos);
} }
/** /**
* 校验落地页模板pageTemplateCode 是否被关联 * 校验落地页模板pageTemplateCode 是否被关联
* *
* @param pageTemplateCode * @param pageCode
* @return true 存在关联 * @return true 存在关联
* false 不存在关联关系 * false 不存在关联关系
*/ */
private Integer checkPageIsBeQuoted(String pageTemplateCode) { private Integer checkPageIsBeQuoted(String pageCode) {
List<HmPageRelationBO> relations = pageRelationService.queryPageTemplateRelation(pageTemplateCode); List<HmPageRelationBO> relations = pageRelationService.queryPageRelation(pageCode);
return 0; return 0;
} }
...@@ -112,7 +109,7 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService { ...@@ -112,7 +109,7 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
* @return * @return
*/ */
@Override @Override
public ServiceResponse<Page<HmPageRelationRespDTO>> queryPageRelation(HmPageRelationQueryDTO relationQueryDTO) { public ServiceResponse<Page<HmPageRelationDTO>> queryPageRelation(HmPageRelationQDTO relationQueryDTO) {
HmPageRelationQO hmPageRelationQo = new HmPageRelationQO(); HmPageRelationQO hmPageRelationQo = new HmPageRelationQO();
hmPageRelationQo.setTemplateSearchText(relationQueryDTO.getSearchText()); hmPageRelationQo.setTemplateSearchText(relationQueryDTO.getSearchText());
hmPageRelationQo.setEnterpriseId(relationQueryDTO.getEnterpriseId()); hmPageRelationQo.setEnterpriseId(relationQueryDTO.getEnterpriseId());
...@@ -120,8 +117,9 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService { ...@@ -120,8 +117,9 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
hmPageRelationQo.setPageNum(relationQueryDTO.getPageNum()); hmPageRelationQo.setPageNum(relationQueryDTO.getPageNum());
hmPageRelationQo.setPageSize(relationQueryDTO.getPageSize()); hmPageRelationQo.setPageSize(relationQueryDTO.getPageSize());
hmPageRelationQo.setPageCode(relationQueryDTO.getPageId() + ""); hmPageRelationQo.setPageCode(relationQueryDTO.getPageId() + "");
Page<HmPageRelationBO> hmPageRelationPage = pageRelationService.queryPageTemplateRelationWithSearchText(hmPageRelationQo); hmPageRelationQo.setStatus(HmPageStatus.ENABLE.getCode());
return ServiceResponse.success(PageUtil.changeToCurrentPage(hmPageRelationPage, HmPageRelationRespDTO.class)); Page<HmPageRelationBO> hmPageRelationPage = pageRelationService.queryPageRelationWithSearchText(hmPageRelationQo);
return ServiceResponse.success(PageUtil.changeToCurrentPage(hmPageRelationPage, HmPageRelationDTO.class));
} }
/** /**
...@@ -131,13 +129,13 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService { ...@@ -131,13 +129,13 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
* @return * @return
*/ */
@Override @Override
public ServiceResponse<HmPageTemplateRespDTO> queryPageTemplateDetail(Long pageId) { public ServiceResponse<HmPageDTO> queryPageDetail(Long pageId) {
HmPageBO pageBO = haobanHmPageService.queryHmPageDetail(pageId); HmPageBO pageBO = haobanHmPageService.queryHmPageDetail(pageId);
if (pageBO == null) { if (pageBO == null) {
return ServiceResponse.success(); return ServiceResponse.success();
} }
HmPageTemplateRespDTO hmPageTemplateRespDTO = new HmPageTemplateRespDTO(); HmPageDTO hmPageDTO = new HmPageDTO();
BeanUtils.copyProperties(pageBO, hmPageTemplateRespDTO); BeanUtils.copyProperties(pageBO, hmPageDTO);
return ServiceResponse.success(hmPageTemplateRespDTO); return ServiceResponse.success(hmPageDTO);
} }
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmWelcomeRelationApiServiceImpl.java
...@@ -6,11 +6,11 @@ import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon; ...@@ -6,11 +6,11 @@ import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.hm.HmWelcomeRelationDTO; import com.gic.haoban.manage.api.dto.hm.HmWelcomeRelationDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO;
import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService; import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper; import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO; import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
import com.github.pagehelper.PageHelper; import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -24,24 +24,24 @@ import org.springframework.stereotype.Component; ...@@ -24,24 +24,24 @@ import org.springframework.stereotype.Component;
public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiService { public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiService {
@Autowired @Autowired
private TabHaobanWelcomeTemplateRelationMapper welcomeTemplateRelationMapper; private WelcomeRelationService welcomeRelationService;
/** /**
* 条件查询 欢迎语关联关系 * 条件查询 欢迎语关联关系
* *
* @param queryWelcomeRelationQDTO * @param queryWelcomeRelationQdto
* @return * @return
*/ */
@Override @Override
public ServiceResponse<Page<HmWelcomeRelationDTO>> queryWelcomeRelation(QueryWelcomeRelationQDTO queryWelcomeRelationQDTO) { public ServiceResponse<Page<HmWelcomeRelationDTO>> queryWelcomeRelation(QueryWelcomeRelationQDTO queryWelcomeRelationQdto) {
if (queryWelcomeRelationQDTO.getWelcomeId() == null){ if (queryWelcomeRelationQdto.getWelcomeId() == null){
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_2.getCode()+"", HaoBanErrCodeCommon.ERR_2.getMsg()); return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_2.getCode()+"", HaoBanErrCodeCommon.ERR_2.getMsg());
} }
WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO(); WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
welcomeRelationQo.setWelcomeId(queryWelcomeRelationQDTO.getWelcomeId()); welcomeRelationQo.setWelcomeId(queryWelcomeRelationQdto.getWelcomeId());
PageHelper.startPage(queryWelcomeRelationQDTO.getPageNum(), queryWelcomeRelationQDTO.getPageSize()); welcomeRelationQo.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations = Page<HmWelcomeRelationBO> welcomeRelationPage = welcomeRelationService.queryWelcomeRelationPage(welcomeRelationQo);
(com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation>) welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo); Page<HmWelcomeRelationDTO> welcomeRelationDTOPage = PageUtil.changeToCurrentPage(welcomeRelationPage, HmWelcomeRelationDTO.class);
Page<HmWelcomeRelationDTO> hmWelcomeRelationDTOPage = PageUtil.changePageHelperToCurrentPage(tabHaobanWelcomeTemplateRelations, HmWelcomeRelationDTO.class); return ServiceResponse.success(welcomeRelationDTOPage);
return ServiceResponse.success(hmWelcomeRelationDTOPage);
} }
} }
haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
ref="hmGroupApiServiceImpl" timeout="10000" /> ref="hmGroupApiServiceImpl" timeout="10000" />
<dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService" <dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService"
ref="hmWelcomeRelationApiServiceImpl" timeout="10000" /> ref="hmWelcomeRelationApiServiceImpl" timeout="10000" />
<dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService" <dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmPageApiService"
ref="hmPageTemplateApiServiceImpl" timeout="10000" /> ref="hmPageTemplateApiServiceImpl" timeout="10000" />
<dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmQrcodeApiService" <dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmQrcodeApiService"
ref="hmQrcodeApiServiceImpl" timeout="10000" /> ref="hmQrcodeApiServiceImpl" timeout="10000" />
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeTemplateRelationMapper.xml
...@@ -163,6 +163,9 @@ ...@@ -163,6 +163,9 @@
<if test="welcomeId != null"> <if test="welcomeId != null">
and welcome_id = #{welcomeId} and welcome_id = #{welcomeId}
</if> </if>
<if test="status != null">
and `status` = #{status}
</if>
</where> </where>
</select> </select>
......
haoban-manage3-service/src/main/resources/mapper/hm/HmLinkMapper.xml
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<result column="custom_rule_json" property="customRuleJson"/> <result column="custom_rule_json" property="customRuleJson"/>
<result column="member_label_id" property="memberLabelId"/> <result column="member_label_id" property="memberLabelId"/>
<result column="status_flag" property="statusFlag"/> <result column="status_flag" property="statusFlag"/>
<result column="short_code" property="shortCode" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
link_id, link_id,
...@@ -41,7 +42,7 @@ ...@@ -41,7 +42,7 @@
store_rule_json, store_rule_json,
custom_rule_json, custom_rule_json,
member_label_id, member_label_id,
status_flag status_flag,shortCode
</sql> </sql>
<!-- ===================== 新增 ======================== --> <!-- ===================== 新增 ======================== -->
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.hm.TabHmLink"> <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.hm.TabHmLink">
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
store_rule_json, store_rule_json,
custom_rule_json, custom_rule_json,
member_label_id, member_label_id,
status_flag status_flag , short_code
)VALUES( )VALUES(
#{linkId,jdbcType=BIGINT}, #{linkId,jdbcType=BIGINT},
#{linkCode,jdbcType=VARCHAR}, #{linkCode,jdbcType=VARCHAR},
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
#{storeRuleJson,jdbcType=VARCHAR}, #{storeRuleJson,jdbcType=VARCHAR},
#{customRuleJson,jdbcType=VARCHAR}, #{customRuleJson,jdbcType=VARCHAR},
#{memberLabelId,jdbcType=VARCHAR}, #{memberLabelId,jdbcType=VARCHAR},
#{statusFlag,jdbcType=INTEGER} #{statusFlag,jdbcType=INTEGER} , #{shortCode}
) )
]]> ]]>
</insert> </insert>
...@@ -110,7 +111,11 @@ ...@@ -110,7 +111,11 @@
<!-- ============ 查询=============--> <!-- ============ 查询=============-->
<select id="selectById" parameterType="long" resultMap="result-map-tabHaobanHmLink"> <select id="selectById" parameterType="long" resultMap="result-map-tabHaobanHmLink">
SELECT * FROM tab_haoban_hm_link WHERE link_id = #{linkId} SELECT <include refid="Base_Column_List" /> FROM tab_haoban_hm_link WHERE link_id = #{linkId} and status_flag = 1
</select>
<select id="selectByShortCode" resultMap="result-map-tabHaobanHmLink">
SELECT <include refid="Base_Column_List" /> FROM tab_haoban_hm_link WHERE enterprise_id=#{enterpriseId} and short_code=#{shortCode} and status_flag = 1
</select> </select>
<select id="listForSms" resultMap="result-map-tabHaobanHmLink"> <select id="listForSms" resultMap="result-map-tabHaobanHmLink">
......
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmPageMapper.xml
...@@ -275,5 +275,6 @@ ...@@ -275,5 +275,6 @@
and #{endTime} >= create_time and #{endTime} >= create_time
</if> </if>
</where> </where>
order by page_id desc
</select> </select>
</mapper> </mapper>
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmPageRelationMapper.xml
...@@ -165,5 +165,6 @@ ...@@ -165,5 +165,6 @@
and `status` = #{status} and `status` = #{status}
</if> </if>
</where> </where>
order by relation_id desc
</select> </select>
</mapper> </mapper>
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/hm/WxUserAddLogMapper.xml
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.haoban.manage.service.dao.mapper.hm.WxUserAddLogMapper"> <mapper namespace="com.gic.haoban.manage.service.dao.mapper.hm.WxUserAddLogMapper">
<resultMap type="com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog" id="result-map-tabHaobanWxUserAddLog"> <resultMap type="com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog"
<result column="log_id" property="logId"/> id="result-map-tabHaobanWxUserAddLog">
<result column="wx_enterprise_id" property="wxEnterpriseId"/> <result column="log_id" property="logId" />
<result column="enterprise_id" property="enterpriseId"/> <result column="wx_enterprise_id" property="wxEnterpriseId" />
<result column="external_userid" property="externalUserid"/> <result column="enterprise_id" property="enterpriseId" />
<result column="staff_id" property="staffId"/> <result column="external_userid" property="externalUserid" />
<result column="staff_name" property="staffName"/> <result column="staff_id" property="staffId" />
<result column="wx_user_id" property="wxUserId"/> <result column="staff_name" property="staffName" />
<result column="status_flag" property="statusFlag"/> <result column="wx_user_id" property="wxUserId" />
<result column="add_channel" property="addChannel"/> <result column="status_flag" property="statusFlag" />
<result column="hm_id" property="hmId"/> <result column="add_channel" property="addChannel" />
<result column="hm_name" property="hmName"/> <result column="hm_id" property="hmId" />
<result column="link_id" property="linkId"/> <result column="hm_name" property="hmName" />
<result column="link_name" property="linkName"/> <result column="link_id" property="linkId" />
<result column="member_id" property="memberId"/> <result column="link_name" property="linkName" />
<result column="member_name" property="memberName"/> <result column="member_id" property="memberId" />
<result column="member_nick" property="memberNick"/> <result column="member_name" property="memberName" />
<result column="member_image" property="memberImage"/> <result column="member_nick" property="memberNick" />
<result column="member_phone" property="memberPhone"/> <result column="member_image" property="memberImage" />
<result column="member_grade_id" property="memberGradeId"/> <result column="member_phone" property="memberPhone" />
<result column="member_grade_name" property="memberGradeName"/> <result column="member_grade_id" property="memberGradeId" />
<result column="member_card_no" property="memberCardNo"/> <result column="member_grade_name" property="memberGradeName" />
<result column="clerk_id" property="clerkId"/> <result column="member_card_no" property="memberCardNo" />
<result column="clerk_code" property="clerkCode"/> <result column="clerk_id" property="clerkId" />
<result column="clerk_name" property="clerkName"/> <result column="clerk_code" property="clerkCode" />
<result column="store_id" property="storeId"/> <result column="clerk_name" property="clerkName" />
<result column="store_name" property="storeName"/> <result column="store_id" property="storeId" />
<result column="store_code" property="storeCode"/> <result column="store_name" property="storeName" />
<result column="member_label_id" property="memberLabelId"/> <result column="store_code" property="storeCode" />
<result column="member_label_name" property="memberLabelName"/> <result column="member_label_id" property="memberLabelId" />
<result column="create_time" property="createTime"/> <result column="member_label_name" property="memberLabelName" />
<result column="update_time" property="updateTime"/> <result column="create_time" property="createTime" />
<result column="all_del_flag" property="allDelFlag"/> <result column="update_time" property="updateTime" />
</resultMap> <result column="all_del_flag" property="allDelFlag" />
<sql id="Base_Column_List"> </resultMap>
log_id, <sql id="Base_Column_List">
wx_enterprise_id, log_id,
enterprise_id, wx_enterprise_id,
external_userid, enterprise_id,
staff_id, external_userid,
staff_name, staff_id,
wx_user_id, staff_name,
status_flag, wx_user_id,
add_channel, status_flag,
hm_id, add_channel,
hm_name, hm_id,
link_id, hm_name,
link_name, link_id,
member_id, link_name,
member_name, member_id,
member_nick, member_name,
member_image, member_nick,
member_phone, member_image,
member_grade_id, member_phone,
member_grade_name, member_grade_id,
member_card_no, member_grade_name,
clerk_id, member_card_no,
clerk_code, clerk_id,
clerk_name, clerk_code,
store_id, clerk_name,
store_name, store_id,
store_code, store_name,
member_label_id, store_code,
member_label_name, member_label_id,
create_time, member_label_name,
update_time, create_time,
all_del_flag update_time,
</sql> all_del_flag
<!-- ===================== 新增 ======================== --> </sql>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog"> <!-- ===================== 新增 ======================== -->
<insert id="insert"
parameterType="com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog">
<![CDATA[ <![CDATA[
INSERT INTO tab_haoban_wx_user_add_log( INSERT INTO tab_haoban_wx_user_add_log(
log_id, log_id,
...@@ -135,14 +137,30 @@ ...@@ -135,14 +137,30 @@
#{storeCode,jdbcType=VARCHAR}, #{storeCode,jdbcType=VARCHAR},
#{memberLabelId,jdbcType=VARCHAR}, #{memberLabelId,jdbcType=VARCHAR},
#{memberLabelName,jdbcType=VARCHAR}, #{memberLabelName,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, now(),
#{updateTime,jdbcType=TIMESTAMP}, now(),
#{allDelFlag,jdbcType=INTEGER} #{allDelFlag,jdbcType=INTEGER}
) )
]]> ]]>
</insert> </insert>
<select id="listAll" parameterType="com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog" resultMap="result-map-tabHaobanWxUserAddLog"> <select id="listAllForDel"
select * from tab_haoban_wx_user_add_log parameterType="com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog"
</select> resultMap="result-map-tabHaobanWxUserAddLog">
select
<include refid="Base_Column_List" />
from tab_haoban_wx_user_add_log where
external_userid=#{externalUserid} and status_flag != 0 order by
create_time asc
</select>
<select id="selectNewLog" resultMap="result-map-tabHaobanWxUserAddLog">
select
<include refid="Base_Column_List" />
from tab_haoban_wx_user_add_log where
external_userid=#{externalUserid} and wx_user_id =#{wxUserId} and
status_flag != 0 order by create_time desc limit 1
</select>
</mapper> </mapper>
\ No newline at end of file
haoban-manage3-service/src/test/java/ErrorLogTest.java
import com.gic.haoban.manage.service.entity.TabHaobanErrorLog; import com.gic.haoban.manage.service.entity.TabHaobanErrorLog;
import com.gic.haoban.manage.service.service.ErrorLogService; import com.gic.haoban.manage.service.service.ErrorLogService;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/** /**
* desc： * desc：
* *
* @author: YongEn * @author: YongEn
* @date: 2022/1/18 * @date: 2022/1/18
**/ **/
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"}) @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
public class ErrorLogTest { public class ErrorLogTest {
@Autowired @Autowired
private ErrorLogService errorLogService; private ErrorLogService errorLogService;
@Test @Test
public void testSave() { public void testSave() {
TabHaobanErrorLog errorLog = new TabHaobanErrorLog(); TabHaobanErrorLog errorLog = new TabHaobanErrorLog();
errorLog.setEnterpriseId("123123"); errorLog.setEnterpriseId("123123");
errorLog.setModuleDesc("haoban-manage3-service"); errorLog.setModuleDesc("haoban-manage3-service");
errorLog.setErrorDesc("测试错误"); errorLog.setErrorDesc("测试错误");
errorLog.setErrorFlagId("123123"); errorLog.setErrorFlagId("123123");
errorLog.setErrorParam("{123,123}"); errorLog.setErrorParam("{123,123}");
errorLog.setRemark("123123"); errorLog.setRemark("123123");
errorLogService.save(errorLog); errorLogService.save(errorLog);
} }
} }
haoban-manage3-service/src/test/java/HandoverTest.java
import cn.hutool.core.thread.ConcurrencyTester; import cn.hutool.core.thread.ConcurrencyTester;
import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.thread.ThreadUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.GICMQClientUtil; import com.gic.commons.util.GICMQClientUtil;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.manage.api.dto.HandoverExternalDTO; import com.gic.haoban.manage.api.dto.HandoverExternalDTO;
import com.gic.haoban.manage.api.service.*; import com.gic.haoban.manage.api.service.*;
import com.gic.haoban.manage.service.service.StaffService; import com.gic.haoban.manage.service.service.StaffService;
import com.gic.haoban.manage.service.service.TestService; import com.gic.haoban.manage.service.service.TestService;
import com.gic.mq.sdk.GicMQClient; import com.gic.mq.sdk.GicMQClient;
import com.gic.wechat.api.service.qywx.QywxUserApiService; import com.gic.wechat.api.service.qywx.QywxUserApiService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"}) @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
public class HandoverTest { public class HandoverTest {
private static Logger logger = LoggerFactory.getLogger(HandoverTest.class); private static Logger logger = LoggerFactory.getLogger(HandoverTest.class);
@Autowired @Autowired
private HandoverOperationApiService handoverOperationApiService; private HandoverOperationApiService handoverOperationApiService;
@Test @Test
public void test() { public void test() {
String wxEnterpriseId = "e86dbc7f329d41be9db2e3526c9b48c4"; String wxEnterpriseId = "e86dbc7f329d41be9db2e3526c9b48c4";
handoverOperationApiService.dealQywxEnterpriseHandover(wxEnterpriseId); handoverOperationApiService.dealQywxEnterpriseHandover(wxEnterpriseId);
} }
@Test @Test
public void test1() { public void test1() {
String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b"; String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b";
handoverOperationApiService.dealQywxEnterpriseHandoverResult(wxEnterpriseId); handoverOperationApiService.dealQywxEnterpriseHandoverResult(wxEnterpriseId);
} }
@Test @Test
public void test2() { public void test2() {
String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b"; String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b";
List<String> staffIds = new ArrayList<>(); List<String> staffIds = new ArrayList<>();
staffIds.add("471ef6fbeed84319944e68265855ecb4"); staffIds.add("471ef6fbeed84319944e68265855ecb4");
Page<HandoverExternalDTO> handoverExternalDTOPage = handoverOperationApiService.pageHandoverFriend(wxEnterpriseId, null, staffIds, null, new BasePageInfo()); Page<HandoverExternalDTO> handoverExternalDTOPage = handoverOperationApiService.pageHandoverFriend(wxEnterpriseId, null, staffIds, null, new BasePageInfo());
System.out.println(JSONObject.toJSONString(handoverExternalDTOPage)); System.out.println(JSONObject.toJSONString(handoverExternalDTOPage));
} }
@Test @Test
public void test3() { public void test3() {
String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b"; String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b";
GicMQClient clientInstance = GICMQClientUtil.getClientInstance(); GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
try { try {
clientInstance.sendMessage("haobanEcmTaskDataCallback", "11111"); clientInstance.sendMessage("haobanEcmTaskDataCallback", "11111");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
haoban-manage3-service/src/test/java/NotityTest.java
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.haoban.manage.api.dto.AlertMessageDTO; import com.gic.haoban.manage.api.dto.AlertMessageDTO;
import com.gic.haoban.manage.api.dto.notify.qdto.NoticeMessageQDTO; import com.gic.haoban.manage.api.dto.notify.qdto.NoticeMessageQDTO;
import com.gic.haoban.manage.api.enums.AlertTypeEnum; import com.gic.haoban.manage.api.enums.AlertTypeEnum;
import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum; import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
import com.gic.haoban.manage.api.service.CheckQywxSettingApiService; import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
import com.gic.haoban.manage.api.service.QywxTagApiService; import com.gic.haoban.manage.api.service.QywxTagApiService;
import com.gic.haoban.manage.api.service.notify.NoticeMessageApiService; import com.gic.haoban.manage.api.service.notify.NoticeMessageApiService;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"}) @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
public class NotityTest { public class NotityTest {
private static Logger logger = LoggerFactory.getLogger(NotityTest.class); private static Logger logger = LoggerFactory.getLogger(NotityTest.class);
@Autowired @Autowired
private QywxTagApiService qywxTagApiService; private QywxTagApiService qywxTagApiService;
@Autowired @Autowired
private NoticeMessageApiService noticeMessageApiService; private NoticeMessageApiService noticeMessageApiService;
@Test @Test
public void test() { public void test() {
Map<String, String> contentMap = new HashMap<String, String>(); Map<String, String> contentMap = new HashMap<String, String>();
contentMap.put("test", "test"); contentMap.put("test", "test");
Map<String, Object> extMap = new HashMap<String, Object>(); Map<String, Object> extMap = new HashMap<String, Object>();
extMap.put("test111", "tes111t"); extMap.put("test111", "tes111t");
NoticeMessageQDTO noticeMessageQDTO = new NoticeMessageQDTO(); NoticeMessageQDTO noticeMessageQDTO = new NoticeMessageQDTO();
noticeMessageQDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000"); noticeMessageQDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
noticeMessageQDTO.setMessageType(NoticeMessageTypeEnum.ACTIVITY_AWARD.getType()); noticeMessageQDTO.setMessageType(NoticeMessageTypeEnum.ACTIVITY_AWARD.getType());
noticeMessageQDTO.setContentMap(contentMap); noticeMessageQDTO.setContentMap(contentMap);
noticeMessageQDTO.setClerkId("70eb25bfb94b4ffb998d4bd817fbd7e2"); noticeMessageQDTO.setClerkId("70eb25bfb94b4ffb998d4bd817fbd7e2");
noticeMessageQDTO.setOptTargetId("testtatget"); noticeMessageQDTO.setOptTargetId("testtatget");
noticeMessageQDTO.setExtendContent(extMap); noticeMessageQDTO.setExtendContent(extMap);
String str = "{\"clerkId\":\"28974631cc7a47398ec592d9f61ca210\",\"enterpriseId\":\"ff8080815dacd3a2015dacd3ef5c0000\",\"extendContent\":{\"taskName\":\"上传12-26日报\",\"storeId\":\"ff8080817a578567017a75b014d900be\",\"taskId\":\"01bafd19b050421ba72e4d130508a24f\"},\"messageType\":3031}"; String str = "{\"clerkId\":\"28974631cc7a47398ec592d9f61ca210\",\"enterpriseId\":\"ff8080815dacd3a2015dacd3ef5c0000\",\"extendContent\":{\"taskName\":\"上传12-26日报\",\"storeId\":\"ff8080817a578567017a75b014d900be\",\"taskId\":\"01bafd19b050421ba72e4d130508a24f\"},\"messageType\":3031}";
noticeMessageApiService.noticeMessageMq(str); noticeMessageApiService.noticeMessageMq(str);
} }
@Test @Test
public void test2() { public void test2() {
} }
@Test @Test
public void test3() { public void test3() {
qywxTagApiService.checkQywxSync("-1"); qywxTagApiService.checkQywxSync("-1");
} }
} }
haoban-manage3-service/src/test/java/QywxTagTest.java
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.GICMQClientUtil; import com.gic.commons.util.GICMQClientUtil;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.manage.api.dto.AlertMessageDTO; import com.gic.haoban.manage.api.dto.AlertMessageDTO;
import com.gic.haoban.manage.api.dto.HandoverExternalDTO; import com.gic.haoban.manage.api.dto.HandoverExternalDTO;
import com.gic.haoban.manage.api.enums.AlertTypeEnum; import com.gic.haoban.manage.api.enums.AlertTypeEnum;
import com.gic.haoban.manage.api.service.CheckQywxSettingApiService; import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
import com.gic.haoban.manage.api.service.HandoverOperationApiService; import com.gic.haoban.manage.api.service.HandoverOperationApiService;
import com.gic.haoban.manage.api.service.QywxTagApiService; import com.gic.haoban.manage.api.service.QywxTagApiService;
import com.gic.mq.sdk.GicMQClient; import com.gic.mq.sdk.GicMQClient;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"}) @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
public class QywxTagTest { public class QywxTagTest {
private static Logger logger = LoggerFactory.getLogger(QywxTagTest.class); private static Logger logger = LoggerFactory.getLogger(QywxTagTest.class);
@Autowired @Autowired
private QywxTagApiService qywxTagApiService; private QywxTagApiService qywxTagApiService;
@Autowired @Autowired
private CheckQywxSettingApiService checkQywxSettingApiService; private CheckQywxSettingApiService checkQywxSettingApiService;
@Test @Test
public void test() { public void test() {
String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b"; String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b";
qywxTagApiService.pullQywxTag(wxEnterpriseId); qywxTagApiService.pullQywxTag(wxEnterpriseId);
} }
@Test @Test
public void test2() { public void test2() {
AlertMessageDTO messageDTO = new AlertMessageDTO(); AlertMessageDTO messageDTO = new AlertMessageDTO();
messageDTO.setTraceId("111"); messageDTO.setTraceId("111");
messageDTO.setEnterpriseId(""); messageDTO.setEnterpriseId("");
messageDTO.setWxEnterpriseId("ca66a01b79474c40b3e7c7f93daf1a3b"); messageDTO.setWxEnterpriseId("ca66a01b79474c40b3e7c7f93daf1a3b");
messageDTO.setAlertTitle("测试标题"); messageDTO.setAlertTitle("测试标题");
messageDTO.setAlertType(AlertTypeEnum.QYWX_TAG_SYNC.getType()); messageDTO.setAlertType(AlertTypeEnum.QYWX_TAG_SYNC.getType());
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("测试", "test"); map.put("测试", "test");
messageDTO.setContentMap(map); messageDTO.setContentMap(map);
checkQywxSettingApiService.alertCallback(JSONObject.toJSONString(messageDTO)); checkQywxSettingApiService.alertCallback(JSONObject.toJSONString(messageDTO));
} }
@Test @Test
public void test3() { public void test3() {
qywxTagApiService.checkQywxSync("-1"); qywxTagApiService.checkQywxSync("-1");
} }
} }
haoban-manage3-service/src/test/java/TestBeanCopy.java
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO; import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage; import com.gic.haoban.manage.service.entity.hm.TabHaobanHmPage;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -12,7 +12,7 @@ import org.springframework.beans.BeanUtils; ...@@ -12,7 +12,7 @@ import org.springframework.beans.BeanUtils;
public class TestBeanCopy { public class TestBeanCopy {
public static void main(String[] args) { public static void main(String[] args) {
HmPageTemplateDTO pageTemplateDTO = new HmPageTemplateDTO(); HmPageDTO pageTemplateDTO = new HmPageDTO();
pageTemplateDTO.setPageBackgroundImg("dadadadasd"); pageTemplateDTO.setPageBackgroundImg("dadadadasd");
TabHaobanHmPage temp = new TabHaobanHmPage(); TabHaobanHmPage temp = new TabHaobanHmPage();
BeanUtils.copyProperties(pageTemplateDTO, temp); BeanUtils.copyProperties(pageTemplateDTO, temp);
......
haoban-manage3-service/src/test/java/TestOperDatabase.java
import com.gic.haoban.common.utils.UuidUtil; import com.gic.haoban.common.utils.UuidUtil;
import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService; import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanOperationSettingMapper; import com.gic.haoban.manage.service.dao.mapper.TabHaobanOperationSettingMapper;
import com.gic.haoban.manage.service.entity.TabHaobanOperationSetting; import com.gic.haoban.manage.service.entity.TabHaobanOperationSetting;
import com.gic.haoban.manage.service.service.ExternalClerkRelatedService; import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.Date; import java.util.Date;
/** /**
* desc： * desc：
* *
* @author: YongEn * @author: YongEn
* @date: 2021/8/26 * @date: 2021/8/26
**/ **/
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"}) @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
public class TestOperDatabase { public class TestOperDatabase {
@Autowired @Autowired
private TabHaobanOperationSettingMapper tabHaobanOperationSettingMapper; private TabHaobanOperationSettingMapper tabHaobanOperationSettingMapper;
@Autowired @Autowired
private ExternalClerkRelatedService externalClerkRelatedService; private ExternalClerkRelatedService externalClerkRelatedService;
@Test @Test
public void testOperSetting() { public void testOperSetting() {
String s = externalClerkRelatedService.checkAndUpdateMemberByUnonId("ff8080815dacd3a2015dacd3ef5c0000", "ff8080817b95cd7e017b95f2c0ec009d", "orXl9t9_320bmRutZoL8YEpPAc00"); String s = externalClerkRelatedService.checkAndUpdateMemberByUnonId("ff8080815dacd3a2015dacd3ef5c0000", "ff8080817b95cd7e017b95f2c0ec009d", "orXl9t9_320bmRutZoL8YEpPAc00");
System.out.println(s); System.out.println(s);
} }
} }
haoban-manage3-service/src/test/java/TestQo.java
import com.gic.haoban.base.api.common.AppJSONField; import com.gic.haoban.base.api.common.AppJSONField;
import java.io.Serializable; import java.io.Serializable;
/** /**
* Created 2018/10/22. * Created 2018/10/22.
* *
* @author hua * @author hua
*/ */
public class TestQo implements Serializable { public class TestQo implements Serializable {
private String id; private String id;
private String name; private String name;
public String getName() { public String getName() {
return name; return name;
} }
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
public String getId() { public String getId() {
return id; return id;
} }
public void setId(String id) { public void setId(String id) {
this.id = id; this.id = id;
} }
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/config/Config.java
package com.gic.haoban.manage.web.config; package com.gic.haoban.manage.web.config;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
/** /**
* Created by tgs on 2020/2/23. * Created by tgs on 2020/2/23.
*/ */
@Configuration @Configuration
@EnableApolloConfig @EnableApolloConfig
public class Config { public class Config {
@Value("${corpid}") @Value("${corpid}")
private String corpid; private String corpid;
@Value("${suiteid}") @Value("${suiteid}")
private String suiteId; private String suiteId;
@Value("${host}") @Value("${host}")
private String host; private String host;
@Value("${wxSuiteid}") @Value("${wxSuiteid}")
private String wxSuiteid; private String wxSuiteid;
public String getCorpid() { public String getCorpid() {
return corpid; return corpid;
} }
public void setCorpid(String corpid) { public void setCorpid(String corpid) {
this.corpid = corpid; this.corpid = corpid;
} }
public String getSuiteId() { public String getSuiteId() {
return suiteId; return suiteId;
} }
public void setSuiteId(String suiteId) { public void setSuiteId(String suiteId) {
this.suiteId = suiteId; this.suiteId = suiteId;
} }
public String getHost() { public String getHost() {
return host; return host;
} }
public void setHost(String host) { public void setHost(String host) {
this.host = host; this.host = host;
} }
public String getWxSuiteid() { public String getWxSuiteid() {
return wxSuiteid; return wxSuiteid;
} }
public void setWxSuiteid(String wxSuiteid) { public void setWxSuiteid(String wxSuiteid) {
this.wxSuiteid = wxSuiteid; this.wxSuiteid = wxSuiteid;
} }
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SettingController.java
package com.gic.haoban.manage.web.controller; package com.gic.haoban.manage.web.controller;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.OperationSettingDTO; import com.gic.haoban.manage.api.dto.OperationSettingDTO;
import com.gic.haoban.manage.api.service.OperationSettingApiService; import com.gic.haoban.manage.api.service.OperationSettingApiService;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Objects; import java.util.Objects;
/** /**
* desc：设置controller * desc：设置controller
* *
* @author: YongEn * @author: YongEn
* @date: 2021/8/26 * @date: 2021/8/26
**/ **/
@RestController @RestController
@RequestMapping("/setting") @RequestMapping("/setting")
public class SettingController extends WebBaseController { public class SettingController extends WebBaseController {
@Autowired @Autowired
private OperationSettingApiService operationSettingApiService; private OperationSettingApiService operationSettingApiService;
@RequestMapping("/operation-setting/save-or-update") @RequestMapping("/operation-setting/save-or-update")
private HaobanResponse operationSettingSaveOrUpdate(OperationSettingDTO dto) { private HaobanResponse operationSettingSaveOrUpdate(OperationSettingDTO dto) {
// 保存或更新操作设置 // 保存或更新操作设置
if (Objects.isNull(dto) if (Objects.isNull(dto)
|| StringUtils.isEmpty(dto.getWxEnterpriseId())) { || StringUtils.isEmpty(dto.getWxEnterpriseId())) {
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
operationSettingApiService.saveOrUpdate(dto); operationSettingApiService.saveOrUpdate(dto);
return resultResponse(HaoBanErrCode.ERR_1); return resultResponse(HaoBanErrCode.ERR_1);
} }
@RequestMapping(value = "/get-operation-setting", method = RequestMethod.GET) @RequestMapping(value = "/get-operation-setting", method = RequestMethod.GET)
private HaobanResponse getOperationSetting(String wxEnterpriseId) { private HaobanResponse getOperationSetting(String wxEnterpriseId) {
// 查询操作配置 // 查询操作配置
OperationSettingDTO dto = operationSettingApiService.getByWxEnterpriseId(wxEnterpriseId); OperationSettingDTO dto = operationSettingApiService.getByWxEnterpriseId(wxEnterpriseId);
if (Objects.isNull(dto)) { if (Objects.isNull(dto)) {
return resultResponse(HaoBanErrCode.ERR_8); return resultResponse(HaoBanErrCode.ERR_8);
} }
return resultResponse(HaoBanErrCode.ERR_1, dto); return resultResponse(HaoBanErrCode.ERR_1, dto);
} }
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java
...@@ -13,6 +13,7 @@ import com.gic.haoban.manage.api.dto.hm.HmWelcomeRelationDTO; ...@@ -13,6 +13,7 @@ import com.gic.haoban.manage.api.dto.hm.HmWelcomeRelationDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO; import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
...@@ -21,6 +22,7 @@ import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO; ...@@ -21,6 +22,7 @@ import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
import com.gic.haoban.manage.api.enums.hm.HmWelcomeType; import com.gic.haoban.manage.api.enums.hm.HmWelcomeType;
import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService; import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService;
import com.gic.haoban.manage.api.service.out.WelcomeApiService; import com.gic.haoban.manage.api.service.out.WelcomeApiService;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.qo.welcome.ListWelcomeQO; import com.gic.haoban.manage.web.qo.welcome.ListWelcomeQO;
import com.gic.haoban.manage.web.qo.welcome.SaveFriendSettingQO; import com.gic.haoban.manage.web.qo.welcome.SaveFriendSettingQO;
import com.gic.haoban.manage.web.qo.welcome.SaveWelcomeQO; import com.gic.haoban.manage.web.qo.welcome.SaveWelcomeQO;
...@@ -109,8 +111,37 @@ public class WelcomeController extends WebBaseController { ...@@ -109,8 +111,37 @@ public class WelcomeController extends WebBaseController {
if (StringUtils.isEmpty(welcomeId)) { if (StringUtils.isEmpty(welcomeId)) {
RestResponse.failure(Constant.STRING_1, "欢迎语id为空", Boolean.FALSE); RestResponse.failure(Constant.STRING_1, "欢迎语id为空", Boolean.FALSE);
} }
ServiceResponse<Boolean> response = welcomeApiService.removeWelcome(welcomeId); ServiceResponse<WelcomeRemoveCheckDTO> serviceResponse = welcomeApiService.removeWelcomeWithErrorInfo(welcomeId);
return RestResponse.successResult(response.getResult()); if (serviceResponse.getResult() != null) {
// can't remove
return RestResponse.failure(HaoBanErrCode.ERR_9.getCode()+"", this.buildErrorMessage(serviceResponse.getResult()));
}
return RestResponse.successResult();
}
private String buildErrorMessage(WelcomeRemoveCheckDTO welcomeRemoveCheckDTO) {
StringBuilder stringBuilder = new StringBuilder("");
if (welcomeRemoveCheckDTO.getQrCodeReferNum() != null
&& welcomeRemoveCheckDTO.getQrCodeReferNum() > 0
&& welcomeRemoveCheckDTO.getLinkReferNum() != null
&& welcomeRemoveCheckDTO.getLinkReferNum() > 0) {
stringBuilder.append("当前模板已关联状态为正常的活码（")
.append(welcomeRemoveCheckDTO.getQrCodeReferNum())
.append("）、链接（")
.append(welcomeRemoveCheckDTO.getLinkReferNum())
.append("），请确认相关活码是否不再使用该欢迎语以及链接已投放结束，取消关联后才可删除该模板");
} else if (welcomeRemoveCheckDTO.getQrCodeReferNum() != null
&& welcomeRemoveCheckDTO.getQrCodeReferNum() > 0){
stringBuilder.append("当前模板已关联状态为正常的活码（")
.append(welcomeRemoveCheckDTO.getQrCodeReferNum())
.append("），请确认相关活码是否不再使用该欢迎语，取消关联后才可删除该模板");
}else if (welcomeRemoveCheckDTO.getLinkReferNum() != null
&& welcomeRemoveCheckDTO.getLinkReferNum() > 0){
stringBuilder.append("当前模板已关联状态为正常的链接（")
.append(welcomeRemoveCheckDTO.getLinkReferNum())
.append("），请确认相关链接已投放结束，取消关联后才可删除该模板");
}
return stringBuilder.toString();
} }
/** /**
...@@ -220,18 +251,27 @@ public class WelcomeController extends WebBaseController { ...@@ -220,18 +251,27 @@ public class WelcomeController extends WebBaseController {
@RequestMapping(path = "/relation/list") @RequestMapping(path = "/relation/list")
public RestResponse<PageResult2<HmWelcomeRelationDTO>> queryWelcomeRelationList(@RequestParam("welcomeId") String welcomeId, public RestResponse<PageResult2<HmWelcomeRelationDTO>> queryWelcomeRelationList(@RequestParam("welcomeId") String welcomeId,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
QueryWelcomeRelationQDTO queryWelcomeRelationQDTO = new QueryWelcomeRelationQDTO(); QueryWelcomeRelationQDTO queryWelcomeRelationQDTO = new QueryWelcomeRelationQDTO();
queryWelcomeRelationQDTO.setWelcomeId(welcomeId); queryWelcomeRelationQDTO.setWelcomeId(welcomeId);
queryWelcomeRelationQDTO.setPageNum(pageNum); queryWelcomeRelationQDTO.setPageNum(pageNum);
queryWelcomeRelationQDTO.setPageSize(pageSize); queryWelcomeRelationQDTO.setPageSize(pageSize);
ServiceResponse<Page<HmWelcomeRelationDTO>> serviceResponse = welcomeRelationApiService.queryWelcomeRelation(queryWelcomeRelationQDTO); ServiceResponse<Page<HmWelcomeRelationDTO>> serviceResponse = welcomeRelationApiService.queryWelcomeRelation(queryWelcomeRelationQDTO);
if (serviceResponse.isSuccess()){ if (serviceResponse.isSuccess()) {
Page<HmWelcomeRelationDTO> result = serviceResponse.getResult(); Page<HmWelcomeRelationDTO> result = serviceResponse.getResult();
return RestResponse.successResult(PageUtil.getPageInfo(result)); return RestResponse.successResult(PageUtil.getPageInfo(result));
} }
return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage()); return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
} }
@RequestMapping(path = "/statistics")
public RestResponse<?> checkWelcomeReferStatistics(String welcomeId) {
if (StringUtils.isBlank(welcomeId)){
return RestResponse.failure(HaoBanErrCode.ERR_2.getCode()+"", HaoBanErrCode.ERR_2.getMsg());
}
return RestResponse.successResult(welcomeApiService.welcomeReferStatistics(welcomeId));
}
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmGroupController.java
...@@ -103,7 +103,7 @@ public class HmGroupController extends WebBaseController { ...@@ -103,7 +103,7 @@ public class HmGroupController extends WebBaseController {
@RequestMapping(path = "/refer/count") @RequestMapping(path = "/refer/count")
public RestResponse<?> queryGroupTotalReferCount(){ public RestResponse<?> queryGroupTotalReferCount(){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser(); WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
ServiceResponse<Integer> serviceResponse = groupApiService.queryGroupReferCount(loginUser.getEnterpriseId(), loginUser.getWxEnterpriseId()); ServiceResponse<Integer> serviceResponse = groupApiService.queryGroupTotalReferCount(loginUser.getEnterpriseId(), loginUser.getWxEnterpriseId());
return RestResponse.successResult(serviceResponse.getResult()); return RestResponse.successResult(serviceResponse.getResult());
} }
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java
package com.gic.haoban.manage.web.controller.hm; package com.gic.haoban.manage.web.controller.hm;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -20,13 +21,13 @@ import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO; ...@@ -20,13 +21,13 @@ import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil; import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.manage.api.dto.hm.HmLinkDTO; import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
import com.gic.haoban.manage.api.dto.hm.HmLinkStoreSettingDTO; import com.gic.haoban.manage.api.dto.hm.HmLinkStoreSettingDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO; import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO; import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
import com.gic.haoban.manage.api.service.hm.HmLinkApiService; import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
import com.gic.haoban.manage.api.service.hm.HmPageApiService; import com.gic.haoban.manage.api.service.hm.HmPageApiService;
import com.gic.haoban.manage.api.service.out.WelcomeApiService; import com.gic.haoban.manage.api.service.out.WelcomeApiService;
import com.gic.member.tag.api.service.MemberTagApiService;
/** /**
* *
...@@ -367,7 +368,7 @@ public class HmLinkController { ...@@ -367,7 +368,7 @@ public class HmLinkController {
// 落地页 // 落地页
Long pageId = link.getPageId(); Long pageId = link.getPageId();
if (null != pageId) { if (null != pageId) {
ServiceResponse<HmPageTemplateRespDTO> resp = this.hmPageTemplateApiService.queryPageTemplateDetail(pageId); ServiceResponse<HmPageDTO> resp = this.hmPageApiService.queryPageDetail(pageId);
retMap.put("page", resp.getResult()); retMap.put("page", resp.getResult());
} }
// 查询欢迎语 // 查询欢迎语
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmPageController.java 0 → 100644
package com.gic.haoban.manage.web.controller.hm;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.base.api.common.PageResult2;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
import com.gic.haoban.manage.api.service.hm.HmPageApiService;
import com.gic.haoban.manage.web.vo.hm.HmPageInfoVO;
import com.gic.haoban.manage.web.vo.hm.HmPageListVO;
import com.gic.haoban.manage.web.vo.hm.HmPageSettingReq;
import com.gic.haoban.manage.web.vo.hm.PageRelationVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author MUSI
* @Date 2022/7/4 1:58 PM
* @Description
* @Version
**/
@RestController
@RequestMapping(path = "/hm/guide")
public class HmPageController {
@Autowired
private HmPageApiService pageApiService;
@RequestMapping(path = "/page/save")
public RestResponse<?> savePage(HmPageSettingReq pageSettingVO){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageDTO pageDTO = new HmPageDTO();
pageDTO.setPageName(pageSettingVO.getTemplateName());
pageDTO.setPageTitle(pageSettingVO.getPageTitle());
pageDTO.setMerchantName(pageSettingVO.getMerchantName());
pageDTO.setMerchantPhoneNumber(pageSettingVO.getMerchantPhoneNumber());
pageDTO.setMerchantLogo(pageSettingVO.getMerchantLogo());
pageDTO.setPageBackgroundImg(pageSettingVO.getPageBackgroundImg());
pageDTO.setGuideComment(pageSettingVO.getGuideComment());
pageDTO.setCreateorId(loginUser.getClerkId());
pageDTO.setCreateorName(loginUser.getClerkName());
pageDTO.setEnterpriseId(loginUser.getEnterpriseId());
pageDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
ServiceResponse<Long> serviceResponse = pageApiService.saveOrUpdateHmPage(pageDTO);
if (serviceResponse.isSuccess()){
return RestResponse.successResult(serviceResponse.getResult());
}
return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
@RequestMapping(path = "/page/edit")
public RestResponse<?> editPageTemplate(HmPageSettingReq pageSettingVO){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageDTO pageDTO = new HmPageDTO();
pageDTO.setPageId(pageSettingVO.getTemplateId());
pageDTO.setPageName(pageSettingVO.getTemplateName());
pageDTO.setPageTitle(pageSettingVO.getPageTitle());
pageDTO.setMerchantName(pageSettingVO.getMerchantName());
pageDTO.setMerchantPhoneNumber(pageSettingVO.getMerchantPhoneNumber());
pageDTO.setMerchantLogo(pageSettingVO.getMerchantLogo());
pageDTO.setPageBackgroundImg(pageSettingVO.getPageBackgroundImg());
pageDTO.setGuideComment(pageSettingVO.getGuideComment());
pageDTO.setCreateorId(loginUser.getClerkId());
pageDTO.setCreateorName(loginUser.getClerkName());
pageDTO.setEnterpriseId(loginUser.getEnterpriseId());
pageDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
ServiceResponse<Long> serviceResponse = pageApiService.saveOrUpdateHmPage(pageDTO);
if (serviceResponse.isSuccess()){
return RestResponse.successResult(serviceResponse.getResult());
}
return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
@RequestMapping(path = "/page/list")
public RestResponse<?> queryPageList(HmPageListVO pageListVO){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO hmPageQDTO = new com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO();
hmPageQDTO.setPageNum(pageListVO.getPageNum());
hmPageQDTO.setPageSize(pageListVO.getPageSize());
hmPageQDTO.setEnterpriseId(loginUser.getEnterpriseId());
hmPageQDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
hmPageQDTO.setPageSearchText(pageListVO.getPageSearchText());
hmPageQDTO.setStartTime(pageListVO.getStartTime());
hmPageQDTO.setEndTime(pageListVO.getEndTime());
ServiceResponse<Page<HmPageDTO>> serviceResponse = pageApiService.queryPageList(hmPageQDTO);
PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
List<HmPageInfoVO> pageInfoVos = ((List<HmPageDTO>)pageInfo.getList()).stream().map(item -> {
HmPageInfoVO pageInfoVo = new HmPageInfoVO();
BeanUtils.copyProperties(item, pageInfoVo);
pageInfoVo.setTemplateName(item.getPageName());
pageInfoVo.setTemplateCode(item.getPageCode());
pageInfoVo.setTemplateId(item.getPageId());
return pageInfoVo;
}).collect(Collectors.toList());
pageInfo.setList(pageInfoVos);
return RestResponse.successResult(pageInfo);
}
@RequestMapping(path = "/page/delete")
public RestResponse<?> deletePage(Long pageId){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageDTO hmPageDTO = new HmPageDTO();
hmPageDTO.setPageId(pageId);
hmPageDTO.setModifierId(loginUser.getClerkId());
hmPageDTO.setModifierName(loginUser.getClerkName());
ServiceResponse<Boolean> serviceResponse = pageApiService.deleteHmPage(hmPageDTO);
if (serviceResponse.isSuccess()){
return RestResponse.successResult(serviceResponse.getResult());
}
return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
@RequestMapping(path = "/page/detail")
public RestResponse<?> queryPageDetail(Long templateId){
ServiceResponse<HmPageDTO> serviceResponse = pageApiService.queryPageDetail(templateId);
return RestResponse.successResult(serviceResponse.getResult());
}
@RequestMapping(path = "/page/relation")
public RestResponse<?> queryPageRelationList(PageRelationVO pageRelationVO){
HmPageRelationQDTO pageRelationQueryDTO = new HmPageRelationQDTO();
pageRelationQueryDTO.setPageNum(pageRelationVO.getPageNum());
pageRelationQueryDTO.setPageSize(pageRelationVO.getPageSize());
pageRelationQueryDTO.setSearchText(pageRelationVO.getSearchContent());
pageRelationQueryDTO.setPageId(pageRelationQueryDTO.getPageId());
ServiceResponse<Page<HmPageRelationDTO>> serviceResponse = pageApiService.queryPageRelation(pageRelationQueryDTO);
PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
return RestResponse.successResult(pageInfo);
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmPageTemplateController.java deleted 100644 → 0
package com.gic.haoban.manage.web.controller.hm;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.base.api.common.PageResult2;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.hm.HmPageQueryDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationQueryDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageRelationRespDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateDTO;
import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO;
import com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService;
import com.gic.haoban.manage.web.vo.hm.HmPageTemplateListVO;
import com.gic.haoban.manage.web.vo.hm.HmPageTemplateSettingVO;
import com.gic.haoban.manage.web.vo.hm.PageTemplateRelationVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Author MUSI
* @Date 2022/7/4 1:58 PM
* @Description
* @Version
**/
@RestController
@RequestMapping(path = "/hm/guide")
public class HmPageTemplateController {
@Autowired
private HmPageTemplateApiService pageTemplateApiService;
@RequestMapping(path = "/page/save")
public RestResponse<?> savePageTemplate(HmPageTemplateSettingVO pageTemplateSettingVO){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageTemplateDTO pageTemplateDTO = new HmPageTemplateDTO();
pageTemplateDTO.setPageName(pageTemplateSettingVO.getTemplateName());
pageTemplateDTO.setPageTitle(pageTemplateSettingVO.getPageTitle());
pageTemplateDTO.setMerchantName(pageTemplateSettingVO.getMerchantName());
pageTemplateDTO.setMerchantPhoneNumber(pageTemplateSettingVO.getMerchantPhoneNumber());
pageTemplateDTO.setMerchantLogo(pageTemplateSettingVO.getMerchantLogo());
pageTemplateDTO.setPageBackgroundImg(pageTemplateSettingVO.getPageBackgroundImg());
pageTemplateDTO.setGuideComment(pageTemplateSettingVO.getGuideComment());
pageTemplateDTO.setClerkId(loginUser.getClerkId());
pageTemplateDTO.setClerkName(loginUser.getClerkName());
pageTemplateDTO.setEnterpriseId(loginUser.getEnterpriseId());
pageTemplateDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
ServiceResponse<Long> serviceResponse = pageTemplateApiService.saveOrUpdateHmPageTemplate(pageTemplateDTO);
if (serviceResponse.isSuccess()){
return RestResponse.successResult(serviceResponse.getResult());
}
return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
}
@RequestMapping(path = "/page/edit")
public RestResponse<?> editPageTemplate(HmPageTemplateSettingVO pageTemplateSettingVO){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageTemplateDTO pageTemplateDTO = new HmPageTemplateDTO();
pageTemplateDTO.setPageId(pageTemplateSettingVO.getTemplateId());
pageTemplateDTO.setPageName(pageTemplateSettingVO.getTemplateName());
pageTemplateDTO.setPageTitle(pageTemplateSettingVO.getPageTitle());
pageTemplateDTO.setMerchantName(pageTemplateSettingVO.getMerchantName());
pageTemplateDTO.setMerchantPhoneNumber(pageTemplateSettingVO.getMerchantPhoneNumber());
pageTemplateDTO.setMerchantLogo(pageTemplateSettingVO.getMerchantLogo());
pageTemplateDTO.setPageBackgroundImg(pageTemplateSettingVO.getPageBackgroundImg());
pageTemplateDTO.setGuideComment(pageTemplateSettingVO.getGuideComment());
pageTemplateDTO.setClerkId(loginUser.getClerkId());
pageTemplateDTO.setClerkName(loginUser.getClerkName());
pageTemplateDTO.setEnterpriseId(loginUser.getEnterpriseId());
pageTemplateDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
ServiceResponse<Long> serviceResponse = pageTemplateApiService.saveOrUpdateHmPageTemplate(pageTemplateDTO);
if (serviceResponse.isSuccess()){
return RestResponse.successResult(serviceResponse.getResult());
}
return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
}
@RequestMapping(path = "/page/list")
public RestResponse<?> queryPageTemplateList(HmPageTemplateListVO pageTemplateListVO){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageQueryDTO hmPageQueryDTO = new HmPageQueryDTO();
hmPageQueryDTO.setPageNum(pageTemplateListVO.getPageNum());
hmPageQueryDTO.setPageSize(pageTemplateListVO.getPageSize());
hmPageQueryDTO.setEnterpriseId(loginUser.getEnterpriseId());
hmPageQueryDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
hmPageQueryDTO.setPageSearchText(pageTemplateListVO.getPageSearchText());
hmPageQueryDTO.setStartTime(pageTemplateListVO.getStartTime());
hmPageQueryDTO.setEndTime(pageTemplateListVO.getEndTime());
ServiceResponse<Page<HmPageTemplateRespDTO>> serviceResponse = pageTemplateApiService.queryPageTemplateList(hmPageQueryDTO);
PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
return RestResponse.successResult(pageInfo);
}
@RequestMapping(path = "/page/delete")
public RestResponse<?> deletePageTemplate(Long templateId){
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
HmPageTemplateDTO hmPageTemplateDTO = new HmPageTemplateDTO();
hmPageTemplateDTO.setPageId(templateId);
hmPageTemplateDTO.setClerkId(loginUser.getClerkId());
hmPageTemplateDTO.setClerkName(loginUser.getClerkName());
ServiceResponse<Boolean> serviceResponse = pageTemplateApiService.deleteHmPageTemplate(hmPageTemplateDTO);
if (serviceResponse.isSuccess()){
return RestResponse.successResult(serviceResponse.getResult());
}
return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
}
@RequestMapping(path = "/page/detail")
public RestResponse<?> queryPageTemplateDetail(Long templateId){
ServiceResponse<HmPageTemplateRespDTO> serviceResponse = pageTemplateApiService.queryPageTemplateDetail(templateId);
return RestResponse.successResult(serviceResponse.getResult());
}
@RequestMapping(path = "/page/relation")
public RestResponse<?> queryPageTemplateRelationList(PageTemplateRelationVO pageTemplateRelationVO){
HmPageRelationQueryDTO pageRelationQueryDTO = new HmPageRelationQueryDTO();
pageRelationQueryDTO.setPageNum(pageTemplateRelationVO.getPageNum());
pageRelationQueryDTO.setPageSize(pageTemplateRelationVO.getPageSize());
pageRelationQueryDTO.setSearchText(pageTemplateRelationVO.getSearchContent());
pageRelationQueryDTO.setPageId(pageRelationQueryDTO.getPageId());
ServiceResponse<Page<HmPageRelationRespDTO>> serviceResponse = pageTemplateApiService.queryPageRelation(pageRelationQueryDTO);
PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
return RestResponse.successResult(pageInfo);
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmStoreController.java
...@@ -32,12 +32,14 @@ import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO; ...@@ -32,12 +32,14 @@ import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil; import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO; import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeListDTO; import com.gic.haoban.manage.api.dto.hm.HmQrcodeListDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeStoreDTO;
import com.gic.haoban.manage.api.service.StaffApiService; import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService; import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService; import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
import com.gic.haoban.manage.web.vo.hm.ClerkListVO; import com.gic.haoban.manage.web.vo.hm.ClerkListVO;
import com.gic.haoban.manage.web.vo.hm.ClerkStoreListVO; import com.gic.haoban.manage.web.vo.hm.ClerkStoreListVO;
import com.gic.haoban.manage.web.vo.hm.StoreVO; import com.gic.haoban.manage.web.vo.hm.StoreVO;
import com.google.common.collect.Sets;
@RestController @RestController
@RequestMapping("hm") @RequestMapping("hm")
...@@ -54,7 +56,7 @@ public class HmStoreController { ...@@ -54,7 +56,7 @@ public class HmStoreController {
@Autowired @Autowired
private HmQrcodeApiService hmQrcodeApiService; private HmQrcodeApiService hmQrcodeApiService;
@Autowired @Autowired
private StoreService storeService ; private StoreService storeService;
/** /**
* *
...@@ -70,7 +72,7 @@ public class HmStoreController { ...@@ -70,7 +72,7 @@ public class HmStoreController {
@ResponseBody @ResponseBody
public RestResponse<Object> listStoreClerk(HttpServletRequest request, BasePageInfo basePageInfo) { public RestResponse<Object> listStoreClerk(HttpServletRequest request, BasePageInfo basePageInfo) {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser(); WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId() ; String wxEnterpriseId = loginUser.getWxEnterpriseId();
// 分组id // 分组id
String storeGroupId = request.getParameter("storeGroupId"); String storeGroupId = request.getParameter("storeGroupId");
// 门店参数 // 门店参数
...@@ -115,12 +117,12 @@ public class HmStoreController { ...@@ -115,12 +117,12 @@ public class HmStoreController {
retPage.setTotalPage(page.getTotalPage()); retPage.setTotalPage(page.getTotalPage());
List<ClerkStoreListVO> result = EntityUtil.changeEntityListByJSON(ClerkStoreListVO.class, page.getResult()); List<ClerkStoreListVO> result = EntityUtil.changeEntityListByJSON(ClerkStoreListVO.class, page.getResult());
// 好办状态 // 好办状态
this.haobanStatus(result,wxEnterpriseId); this.haobanStatus(result, wxEnterpriseId);
retPage.setResult(result); retPage.setResult(result);
return RestResponse.successResult(retPage); return RestResponse.successResult(retPage);
} }
private void haobanStatus(List<ClerkStoreListVO> list , String wxEnterpriseId) { private void haobanStatus(List<ClerkStoreListVO> list, String wxEnterpriseId) {
List<String> clerkIdList = new ArrayList<>(); List<String> clerkIdList = new ArrayList<>();
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return; return;
...@@ -145,9 +147,9 @@ public class HmStoreController { ...@@ -145,9 +147,9 @@ public class HmStoreController {
List<String> statusList = new ArrayList<>(); List<String> statusList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(clerkIdList)) { if (CollectionUtils.isNotEmpty(clerkIdList)) {
List<StaffClerkRelationDTO> clerkRelationList = this.staffClerkRelationApiService List<StaffClerkRelationDTO> clerkRelationList = this.staffClerkRelationApiService
.listClerkIdConcatFlagByClerkIds(clerkIdList,wxEnterpriseId); .listClerkIdConcatFlagByClerkIds(clerkIdList, wxEnterpriseId);
if (CollectionUtils.isNotEmpty(clerkRelationList)) { if (CollectionUtils.isNotEmpty(clerkRelationList)) {
status2List.addAll(clerkRelationList.stream().filter(dto -> dto.getOpenConcatFlag()== 0) status2List.addAll(clerkRelationList.stream().filter(dto -> dto.getOpenConcatFlag() == 0)
.map(dto -> dto.getClerkId()).collect(Collectors.toList())); .map(dto -> dto.getClerkId()).collect(Collectors.toList()));
statusList.addAll(clerkRelationList.stream().filter(dto -> dto.getOpenConcatFlag() == 1) statusList.addAll(clerkRelationList.stream().filter(dto -> dto.getOpenConcatFlag() == 1)
.map(dto -> dto.getClerkId()).collect(Collectors.toList())); .map(dto -> dto.getClerkId()).collect(Collectors.toList()));
...@@ -199,9 +201,10 @@ public class HmStoreController { ...@@ -199,9 +201,10 @@ public class HmStoreController {
@ResponseBody @ResponseBody
public RestResponse<Object> listStore(HttpServletRequest request, BasePageInfo basePageInfo) { public RestResponse<Object> listStore(HttpServletRequest request, BasePageInfo basePageInfo) {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser(); WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
String enterpriseId = loginUser.getEnterpriseId();
String clerkId = loginUser.getClerkId();
// 如果有权限控制,进行管辖门店过0滤 // 如果有权限控制,进行管辖门店过0滤
List<String> authStoreIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(loginUser.getClerkId(), List<String> authStoreIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, enterpriseId);
loginUser.getWxEnterpriseId());
if (CollectionUtils.isEmpty(authStoreIdList)) { if (CollectionUtils.isEmpty(authStoreIdList)) {
return RestResponse.failure("-1", "无授权门店"); return RestResponse.failure("-1", "无授权门店");
} }
...@@ -213,10 +216,23 @@ public class HmStoreController { ...@@ -213,10 +216,23 @@ public class HmStoreController {
String storeSearchParams = request.getParameter("storeSearchParams"); String storeSearchParams = request.getParameter("storeSearchParams");
searchDTO.setSearchName(storeSearchParams); searchDTO.setSearchName(storeSearchParams);
// 企业ID // 企业ID
searchDTO.setEnterpriseId(loginUser.getEnterpriseId()); searchDTO.setEnterpriseId(enterpriseId);
List<HmQrcodeStoreDTO> hmStoreList = this.hmQrcodeApiService.getHmStoreByEnterpriseId(enterpriseId);
if (CollectionUtils.isEmpty(hmStoreList)) {
return RestResponse.failure("-1", "无活码门店");
}
Map<String, Integer> map = hmStoreList.stream()
.collect(Collectors.toMap(HmQrcodeStoreDTO::getStoreId, HmQrcodeStoreDTO::getOverFlag, (k1, k2) -> k1));
List<String> hmStoreIdList = hmStoreList.stream().map(dto -> dto.getStoreId()).collect(Collectors.toList());
Sets.SetView<String> setView = Sets.intersection(Sets.newHashSet(authStoreIdList),
Sets.newHashSet(hmStoreIdList));
hmStoreIdList = setView.stream().collect(Collectors.toList());
if (CollectionUtils.isEmpty(hmStoreList)) {
return RestResponse.failure("-1", "无符合门店");
}
// 授权门店 且有活码的门店 // 授权门店 且有活码的门店
if (CollectionUtils.isNotEmpty(authStoreIdList)) { if (CollectionUtils.isNotEmpty(hmStoreIdList)) {
searchDTO.setAuthStoreIdList(authStoreIdList); searchDTO.setAuthStoreIdList(hmStoreIdList);
} }
// 门店参数 // 门店参数
Page page = new Page(); Page page = new Page();
...@@ -227,7 +243,7 @@ public class HmStoreController { ...@@ -227,7 +243,7 @@ public class HmStoreController {
logger.info("查询条件={}", JSON.toJSONString(page)); logger.info("查询条件={}", JSON.toJSONString(page));
Map<String, Object> result = storeService.getStoreListPage(page); Map<String, Object> result = storeService.getStoreListPage(page);
page = (Page) result.get("page"); page = (Page) result.get("page");
List<StoreDTO> storeList = (List<StoreDTO>)result.get("list"); List<StoreDTO> storeList = (List<StoreDTO>) result.get("list");
List<StoreVO> retList = new ArrayList<StoreVO>(); List<StoreVO> retList = new ArrayList<StoreVO>();
StoreVO vo = null; StoreVO vo = null;
for (StoreDTO dto : storeList) { for (StoreDTO dto : storeList) {
...@@ -235,8 +251,7 @@ public class HmStoreController { ...@@ -235,8 +251,7 @@ public class HmStoreController {
vo.setStoreId(dto.getStoreId()); vo.setStoreId(dto.getStoreId());
vo.setStoreCode(dto.getStoreCode()); vo.setStoreCode(dto.getStoreCode());
vo.setStoreName(dto.getStoreName()); vo.setStoreName(dto.getStoreName());
// todo vo.setIsOver(map.get(dto.getStoreId()) == null ? 0 : map.get(dto.getStoreId()));
vo.setIsOver(1);
retList.add(vo); retList.add(vo);
} }
page.setResult(retList); page.setResult(retList);
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/exception/NoLoginException.java
package com.gic.haoban.manage.web.exception; package com.gic.haoban.manage.web.exception;
/** /**
* 用户未登陆异常 * 用户未登陆异常
* *
* @author zhurz * @author zhurz
*/ */
public class NoLoginException extends RuntimeException { public class NoLoginException extends RuntimeException {
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/init/MyApplicationContextAware.java
package com.gic.haoban.manage.web.init; package com.gic.haoban.manage.web.init;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.DateUtil; import com.gic.commons.util.DateUtil;
import com.gic.quartz.api.dto.QuartzTaskDTO; import com.gic.quartz.api.dto.QuartzTaskDTO;
import com.gic.quartz.api.service.QuartzService; import com.gic.quartz.api.service.QuartzService;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
public class MyApplicationContextAware implements ApplicationContextAware { public class MyApplicationContextAware implements ApplicationContextAware {
private Logger log = LogManager.getLogger(MyApplicationContextAware.class); private Logger log = LogManager.getLogger(MyApplicationContextAware.class);
private static ApplicationContext applicationContext; private static ApplicationContext applicationContext;
@Autowired @Autowired
private QuartzService quartzService; private QuartzService quartzService;
@Override @Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
log.info("【定时开始】----------------------"); log.info("【定时开始】----------------------");
// QuartzTaskDTO taskDTO = buildQuartzMessageDTO("haoban-message-status-time3"); // QuartzTaskDTO taskDTO = buildQuartzMessageDTO("haoban-message-status-time3");
// taskDTO.setTaskParam(""); // taskDTO.setTaskParam("");
// taskDTO.setTaskStatus(1); // taskDTO.setTaskStatus(1);
// taskDTO.setTaskTimeInfo("0 30 1 * * *"); // taskDTO.setTaskTimeInfo("0 30 1 * * *");
//// taskDTO.setTaskTimeInfo("0 0/5 * * * *"); //// taskDTO.setTaskTimeInfo("0 0/5 * * * *");
// quartzService.addOrUpdateQuartzTask(taskDTO); // quartzService.addOrUpdateQuartzTask(taskDTO);
QuartzTaskDTO memberExportTask =buildMemberExportQuartzTaskDTO("haoban-member-export3"); QuartzTaskDTO memberExportTask =buildMemberExportQuartzTaskDTO("haoban-member-export3");
memberExportTask.setTaskParam("-1"); memberExportTask.setTaskParam("-1");
memberExportTask.setTaskStatus(1); memberExportTask.setTaskStatus(1);
memberExportTask.setTaskTimeInfo("0 0/15 * * * *"); memberExportTask.setTaskTimeInfo("0 0/15 * * * *");
quartzService.addOrUpdateQuartzTask(memberExportTask); quartzService.addOrUpdateQuartzTask(memberExportTask);
QuartzTaskDTO taskDTO = buildQuartzTaskDTO("hb-fresh-wx-friend"); QuartzTaskDTO taskDTO = buildQuartzTaskDTO("hb-fresh-wx-friend");
taskDTO.setTaskParam("-1"); taskDTO.setTaskParam("-1");
taskDTO.setTaskStatus(1); taskDTO.setTaskStatus(1);
taskDTO.setTaskTimeInfo("0 0 4 * * *"); taskDTO.setTaskTimeInfo("0 0 4 * * *");
quartzService.addOrUpdateQuartzTask(taskDTO); quartzService.addOrUpdateQuartzTask(taskDTO);
} }
// private QuartzTaskDTO buildQuartzMessageDTO(String id) { // private QuartzTaskDTO buildQuartzMessageDTO(String id) {
// QuartzTaskDTO taskDTO = new QuartzTaskDTO(); // QuartzTaskDTO taskDTO = new QuartzTaskDTO();
// taskDTO.setReferId(id); // taskDTO.setReferId(id);
// taskDTO.setTaskMethod("quartzUpdateMessageStatus"); // taskDTO.setTaskMethod("quartzUpdateMessageStatus");
// taskDTO.setTaskService("com.gic.haoban.app.customer.service.api.service.MessageLogApiService"); // taskDTO.setTaskService("com.gic.haoban.app.customer.service.api.service.MessageLogApiService");
// return taskDTO; // return taskDTO;
// } // }
private QuartzTaskDTO buildQuartzTaskDTO(String id) { private QuartzTaskDTO buildQuartzTaskDTO(String id) {
QuartzTaskDTO taskDTO = new QuartzTaskDTO(); QuartzTaskDTO taskDTO = new QuartzTaskDTO();
taskDTO.setReferId(id); taskDTO.setReferId(id);
taskDTO.setTaskMethod("quartWxFriendClerk"); taskDTO.setTaskMethod("quartWxFriendClerk");
taskDTO.setTaskService("com.gic.haoban.manage.api.service.DealSyncOperationApiService"); taskDTO.setTaskService("com.gic.haoban.manage.api.service.DealSyncOperationApiService");
return taskDTO; return taskDTO;
} }
private QuartzTaskDTO buildMemberExportQuartzTaskDTO(String id) { private QuartzTaskDTO buildMemberExportQuartzTaskDTO(String id) {
QuartzTaskDTO taskDTO = new QuartzTaskDTO(); QuartzTaskDTO taskDTO = new QuartzTaskDTO();
taskDTO.setReferId(id); taskDTO.setReferId(id);
taskDTO.setTaskMethod("quartzMemberExport"); taskDTO.setTaskMethod("quartzMemberExport");
taskDTO.setTaskService("com.gic.haoban.app.customer.service.api.service.MemberExportApiService"); taskDTO.setTaskService("com.gic.haoban.app.customer.service.api.service.MemberExportApiService");
return taskDTO; return taskDTO;
} }
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/interceptor/ResponseInterceptor.java
package com.gic.haoban.manage.web.interceptor; package com.gic.haoban.manage.web.interceptor;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.core.MethodParameter; import org.springframework.core.MethodParameter;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse; import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
import java.lang.reflect.Method; import java.lang.reflect.Method;
/** /**
* Created 2019/2/20. * Created 2019/2/20.
* *
* @author hua * @author hua
*/ */
@ControllerAdvice @ControllerAdvice
public class ResponseInterceptor implements ResponseBodyAdvice<Object> { public class ResponseInterceptor implements ResponseBodyAdvice<Object> {
private Logger logger = LoggerFactory.getLogger(ResponseInterceptor.class); private Logger logger = LoggerFactory.getLogger(ResponseInterceptor.class);
@Override @Override
public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> aClass) { public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> aClass) {
Method method = methodParameter.getMethod(); Method method = methodParameter.getMethod();
String name = method.getName(); String name = method.getName();
logger.info("method：{}", name); logger.info("method：{}", name);
return true; return true;
} }
@Override @Override
public Object beforeBodyWrite(Object haobanResponse, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) { public Object beforeBodyWrite(Object haobanResponse, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
String response = JSONObject.toJSONString(haobanResponse); String response = JSONObject.toJSONString(haobanResponse);
logger.info("response:{}", response); logger.info("response:{}", response);
return haobanResponse; return haobanResponse;
} }
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/DepartmentAddQO.java
package com.gic.haoban.manage.web.qo; package com.gic.haoban.manage.web.qo;
import java.io.Serializable; import java.io.Serializable;
public class DepartmentAddQO implements Serializable { public class DepartmentAddQO implements Serializable {
private String departmentName; private String departmentName;
private String departmentId; private String departmentId;
private String parentId; private String parentId;
private String parentDepartmentId; private String parentDepartmentId;
private String children; private String children;
private Integer storeFlag; private Integer storeFlag;
private String relatedId; private String relatedId;
private Boolean addFlag; private Boolean addFlag;
private Long sort; private Long sort;
private Integer type; private Integer type;
public String getDepartmentName() { public String getDepartmentName() {
return departmentName; return departmentName;
} }
public void setDepartmentName(String departmentName) { public void setDepartmentName(String departmentName) {
this.departmentName = departmentName; this.departmentName = departmentName;
} }
public String getParentId() { public String getParentId() {
return parentId; return parentId;
} }
public void setParentId(String parentId) { public void setParentId(String parentId) {
this.parentId = parentId; this.parentId = parentId;
} }
public String getChildren() { public String getChildren() {
return children; return children;
} }
public void setChildren(String children) { public void setChildren(String children) {
this.children = children; this.children = children;
} }
public String getDepartmentId() { public String getDepartmentId() {
return departmentId; return departmentId;
} }
public void setDepartmentId(String departmentId) { public void setDepartmentId(String departmentId) {
this.departmentId = departmentId; this.departmentId = departmentId;
} }
public Long getSort() { public Long getSort() {
return sort; return sort;
} }
public void setSort(Long sort) { public void setSort(Long sort) {
this.sort = sort; this.sort = sort;
} }
public Integer getStoreFlag() { public Integer getStoreFlag() {
return storeFlag; return storeFlag;
} }
public void setStoreFlag(Integer storeFlag) { public void setStoreFlag(Integer storeFlag) {
this.storeFlag = storeFlag; this.storeFlag = storeFlag;
} }
public String getRelatedId() { public String getRelatedId() {
return relatedId; return relatedId;
} }
public void setRelatedId(String relatedId) { public void setRelatedId(String relatedId) {
this.relatedId = relatedId; this.relatedId = relatedId;
} }
public String getParentDepartmentId() { public String getParentDepartmentId() {
return parentId; return parentId;
} }
public void setParentDepartmentId(String parentDepartmentId) { public void setParentDepartmentId(String parentDepartmentId) {
this.parentDepartmentId = parentDepartmentId; this.parentDepartmentId = parentDepartmentId;
} }
public Boolean getAddFlag() { public Boolean getAddFlag() {
return addFlag; return addFlag;
} }
public void setAddFlag(Boolean addFlag) { public void setAddFlag(Boolean addFlag) {
this.addFlag = addFlag; this.addFlag = addFlag;
} }
public Integer getType() { public Integer getType() {
return type; return type;
} }
public void setType(Integer type) { public void setType(Integer type) {
this.type = type; this.type = type;
} }
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/DepartmentDelQO.java
package com.gic.haoban.manage.web.qo; package com.gic.haoban.manage.web.qo;
import java.io.Serializable; import java.io.Serializable;
public class DepartmentDelQO implements Serializable { public class DepartmentDelQO implements Serializable {
private String departmentIds; private String departmentIds;
public String getDepartmentIds() { public String getDepartmentIds() {
return departmentIds; return departmentIds;
} }
public void setDepartmentIds(String departmentIds) { public void setDepartmentIds(String departmentIds) {
this.departmentIds = departmentIds; this.departmentIds = departmentIds;
} }
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/DepartmentEditQO.java
package com.gic.haoban.manage.web.qo; package com.gic.haoban.manage.web.qo;
import java.io.Serializable; import java.io.Serializable;
public class DepartmentEditQO implements Serializable{ public class DepartmentEditQO implements Serializable{
private String departmentId; private String departmentId;
private String parentId; private String parentId;
private String currDepartment; private String currDepartment;
private String departmentName; private String departmentName;
private Integer sort; private Integer sort;
private String parentDepartmentId; private String parentDepartmentId;
private String children; private String children;
public String getDepartmentId() { public String getDepartmentId() {
return departmentId; return departmentId;
} }
public void setDepartmentId(String departmentId) { public void setDepartmentId(String departmentId) {
this.departmentId = departmentId; this.departmentId = departmentId;
} }
public String getParentId() { public String getParentId() {
return parentDepartmentId; return parentDepartmentId;
} }
public void setParentId(String parentId) { public void setParentId(String parentId) {
this.parentId = parentId; this.parentId = parentId;
} }
public String getCurrDepartment() { public String getCurrDepartment() {
return currDepartment; return currDepartment;
} }
public void setCurrDepartment(String currDepartment) { public void setCurrDepartment(String currDepartment) {
this.currDepartment = currDepartment; this.currDepartment = currDepartment;
} }
public String getDepartmentName() { public String getDepartmentName() {
return departmentName; return departmentName;
} }
public void setDepartmentName(String departmentName) { public void setDepartmentName(String departmentName) {
this.departmentName = departmentName; this.departmentName = departmentName;
} }
public Integer getSort() { public Integer getSort() {
return sort; return sort;
} }
public void setSort(Integer sort) { public void setSort(Integer sort) {
this.sort = sort; this.sort = sort;
} }
public String getParentDepartmentId() { public String getParentDepartmentId() {
return parentDepartmentId; return parentDepartmentId;
} }
public void setParentDepartmentId(String parentDepartmentId) { public void setParentDepartmentId(String parentDepartmentId) {
this.parentDepartmentId = parentDepartmentId; this.parentDepartmentId = parentDepartmentId;
} }
public String getChildren() { public String getChildren() {
return children; return children;
} }
public void setChildren(String children) { public void setChildren(String children) {
this.children = children; this.children = children;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment