Skip to content

H
haoban-manage3.0
Commit c38e6885 by 墨竹
Options

feat:welcome修改

parent 1630a44f
Showing with 135 additions and 305 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WelcomeDTO.java
...@@ -11,6 +11,9 @@ import java.util.Date; ...@@ -11,6 +11,9 @@ import java.util.Date;
* @author fdh * @author fdh
*/ */
public class WelcomeDTO implements Serializable { public class WelcomeDTO implements Serializable {
private static final long serialVersionUID = 1L;
/** /**
* *
*/ */
...@@ -30,6 +33,12 @@ public class WelcomeDTO implements Serializable { ...@@ -30,6 +33,12 @@ public class WelcomeDTO implements Serializable {
* 内容 * 内容
*/ */
private String welcomeContent; private String welcomeContent;
/**
* 图片
*/
private String welcomeImg;
/** /**
* 0删除 1正常 * 0删除 1正常
*/ */
...@@ -49,140 +58,74 @@ public class WelcomeDTO implements Serializable { ...@@ -49,140 +58,74 @@ public class WelcomeDTO implements Serializable {
*/ */
private Date updateTime; private Date updateTime;
/**
*/
private static final long serialVersionUID = 1L;
public Integer getOpenFlag() {
return openFlag;
}
public void setOpenFlag(Integer openFlag) {
this.openFlag = openFlag;
}
/**
* This method returns the value of the database column tab_haoban_welcome.welcome_id
*
* @return the value of tab_haoban_welcome.welcome_id
*/
public String getWelcomeId() { public String getWelcomeId() {
return welcomeId; return welcomeId;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.welcome_id
*
* @param welcomeId the value for tab_haoban_welcome.welcome_id
*/
public void setWelcomeId(String welcomeId) { public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId; this.welcomeId = welcomeId;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.wx_enterprise_id
*
* @return the value of tab_haoban_welcome.wx_enterprise_id
*/
public String getWxEnterpriseId() { public String getWxEnterpriseId() {
return wxEnterpriseId; return wxEnterpriseId;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.wx_enterprise_id
*
* @param wxEnterpriseId the value for tab_haoban_welcome.wx_enterprise_id
*/
public void setWxEnterpriseId(String wxEnterpriseId) { public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId; this.wxEnterpriseId = wxEnterpriseId;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.title
*
* @return the value of tab_haoban_welcome.title
*/
public String getTitle() { public String getTitle() {
return title; return title;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.title
*
* @param title the value for tab_haoban_welcome.title
*/
public void setTitle(String title) { public void setTitle(String title) {
this.title = title; this.title = title;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.welcome_content
*
* @return the value of tab_haoban_welcome.welcome_content
*/
public String getWelcomeContent() { public String getWelcomeContent() {
return welcomeContent; return welcomeContent;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.welcome_content
*
* @param welcomeContent the value for tab_haoban_welcome.welcome_content
*/
public void setWelcomeContent(String welcomeContent) { public void setWelcomeContent(String welcomeContent) {
this.welcomeContent = welcomeContent; this.welcomeContent = welcomeContent;
} }
/** public String getWelcomeImg() {
* This method returns the value of the database column tab_haoban_welcome.status_flag return welcomeImg;
* }
* @return the value of tab_haoban_welcome.status_flag
*/ public void setWelcomeImg(String welcomeImg) {
this.welcomeImg = welcomeImg;
}
public Integer getOpenFlag() {
return openFlag;
}
public void setOpenFlag(Integer openFlag) {
this.openFlag = openFlag;
}
public Integer getStatusFlag() { public Integer getStatusFlag() {
return statusFlag; return statusFlag;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.status_flag
*
* @param statusFlag the value for tab_haoban_welcome.status_flag
*/
public void setStatusFlag(Integer statusFlag) { public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag; this.statusFlag = statusFlag;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.create_time
*
* @return the value of tab_haoban_welcome.create_time
*/
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.create_time
*
* @param createTime the value for tab_haoban_welcome.create_time
*/
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.update_time
*
* @return the value of tab_haoban_welcome.update_time
*/
public Date getUpdateTime() { public Date getUpdateTime() {
return updateTime; return updateTime;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.update_time
*
* @param updateTime the value for tab_haoban_welcome.update_time
*/
public void setUpdateTime(Date updateTime) { public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java
...@@ -137,7 +137,7 @@ public interface WxEnterpriseApiService { ...@@ -137,7 +137,7 @@ public interface WxEnterpriseApiService {
boolean setWelcome(String wxEnterpriseId, Integer openFlag); boolean setWelcome(String wxEnterpriseId, Integer openFlag);
/** /**
* 获取欢迎语 * 删除欢迎语
* *
* @param wxEnterpriseId * @param wxEnterpriseId
* @return * @return
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanWelcomeMapper.java
...@@ -15,10 +15,6 @@ public interface TabHaobanWelcomeMapper { ...@@ -15,10 +15,6 @@ public interface TabHaobanWelcomeMapper {
/** /**
*/ */
int insertSelective(TabWelcome record);
/**
*/
TabWelcome selectByPrimaryKey(String welcomeId); TabWelcome selectByPrimaryKey(String welcomeId);
/** /**
...@@ -27,9 +23,5 @@ public interface TabHaobanWelcomeMapper { ...@@ -27,9 +23,5 @@ public interface TabHaobanWelcomeMapper {
/** /**
*/ */
int updateByPrimaryKey(TabWelcome record);
/**
*/
TabWelcome selectByWxEnterpriseId(String wxEnterpriseId); TabWelcome selectByWxEnterpriseId(String wxEnterpriseId);
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabWelcome.java
...@@ -11,6 +11,8 @@ import java.util.Date; ...@@ -11,6 +11,8 @@ import java.util.Date;
* @author fdh * @author fdh
*/ */
public class TabWelcome implements Serializable { public class TabWelcome implements Serializable {
private static final long serialVersionUID = 1L;
/** /**
* *
*/ */
...@@ -32,6 +34,11 @@ public class TabWelcome implements Serializable { ...@@ -32,6 +34,11 @@ public class TabWelcome implements Serializable {
private String welcomeContent; private String welcomeContent;
/** /**
* 图片
*/
private String welcomeImg;
/**
* 0删除 1正常 * 0删除 1正常
*/ */
private Integer openFlag; private Integer openFlag;
...@@ -51,141 +58,74 @@ public class TabWelcome implements Serializable { ...@@ -51,141 +58,74 @@ public class TabWelcome implements Serializable {
*/ */
private Date updateTime; private Date updateTime;
/**
*/
private static final long serialVersionUID = 1L;
public Integer getOpenFlag() {
return openFlag;
}
public void setOpenFlag(Integer openFlag) {
this.openFlag = openFlag;
}
/**
* This method returns the value of the database column tab_haoban_welcome.welcome_id
*
* @return the value of tab_haoban_welcome.welcome_id
*/
public String getWelcomeId() { public String getWelcomeId() {
return welcomeId; return welcomeId;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.welcome_id
*
* @param welcomeId the value for tab_haoban_welcome.welcome_id
*/
public void setWelcomeId(String welcomeId) { public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId; this.welcomeId = welcomeId;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.wx_enterprise_id
*
* @return the value of tab_haoban_welcome.wx_enterprise_id
*/
public String getWxEnterpriseId() { public String getWxEnterpriseId() {
return wxEnterpriseId; return wxEnterpriseId;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.wx_enterprise_id
*
* @param wxEnterpriseId the value for tab_haoban_welcome.wx_enterprise_id
*/
public void setWxEnterpriseId(String wxEnterpriseId) { public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId; this.wxEnterpriseId = wxEnterpriseId;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.title
*
* @return the value of tab_haoban_welcome.title
*/
public String getTitle() { public String getTitle() {
return title; return title;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.title
*
* @param title the value for tab_haoban_welcome.title
*/
public void setTitle(String title) { public void setTitle(String title) {
this.title = title; this.title = title;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.welcome_content
*
* @return the value of tab_haoban_welcome.welcome_content
*/
public String getWelcomeContent() { public String getWelcomeContent() {
return welcomeContent; return welcomeContent;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.welcome_content
*
* @param welcomeContent the value for tab_haoban_welcome.welcome_content
*/
public void setWelcomeContent(String welcomeContent) { public void setWelcomeContent(String welcomeContent) {
this.welcomeContent = welcomeContent; this.welcomeContent = welcomeContent;
} }
/** public String getWelcomeImg() {
* This method returns the value of the database column tab_haoban_welcome.status_flag return welcomeImg;
* }
* @return the value of tab_haoban_welcome.status_flag
*/ public void setWelcomeImg(String welcomeImg) {
this.welcomeImg = welcomeImg;
}
public Integer getOpenFlag() {
return openFlag;
}
public void setOpenFlag(Integer openFlag) {
this.openFlag = openFlag;
}
public Integer getStatusFlag() { public Integer getStatusFlag() {
return statusFlag; return statusFlag;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.status_flag
*
* @param statusFlag the value for tab_haoban_welcome.status_flag
*/
public void setStatusFlag(Integer statusFlag) { public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag; this.statusFlag = statusFlag;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.create_time
*
* @return the value of tab_haoban_welcome.create_time
*/
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.create_time
*
* @param createTime the value for tab_haoban_welcome.create_time
*/
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
/**
* This method returns the value of the database column tab_haoban_welcome.update_time
*
* @return the value of tab_haoban_welcome.update_time
*/
public Date getUpdateTime() { public Date getUpdateTime() {
return updateTime; return updateTime;
} }
/**
* This method sets the value of the database column tab_haoban_welcome.update_time
*
* @param updateTime the value for tab_haoban_welcome.update_time
*/
public void setUpdateTime(Date updateTime) { public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java
...@@ -264,7 +264,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -264,7 +264,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
} }
tabWelcome.setOpenFlag(openFlag); tabWelcome.setOpenFlag(openFlag);
tabWelcome.setUpdateTime(new Date()); tabWelcome.setUpdateTime(new Date());
welcomeMapper.updateByPrimaryKey(tabWelcome); welcomeMapper.updateByPrimaryKeySelective(tabWelcome);
return true; return true;
} }
...@@ -276,7 +276,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -276,7 +276,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
} }
tabWelcome.setStatusFlag(0); tabWelcome.setStatusFlag(0);
tabWelcome.setUpdateTime(new Date()); tabWelcome.setUpdateTime(new Date());
welcomeMapper.updateByPrimaryKey(tabWelcome); welcomeMapper.updateByPrimaryKeySelective(tabWelcome);
return true; return true;
} }
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
...@@ -240,6 +240,7 @@ ...@@ -240,6 +240,7 @@
and external_user_id = #{externalUserId} and external_user_id = #{externalUserId}
and status_flag = 1 and status_flag = 1
</select> </select>
<update id="delByUserIdAndExternalUserId" <update id="delByUserIdAndExternalUserId"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated"> parameterType="com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated">
update tab_haoban_external_clerk_related update tab_haoban_external_clerk_related
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeMapper.xml
...@@ -6,81 +6,40 @@ ...@@ -6,81 +6,40 @@
<result column="wx_enterprise_id" jdbcType="VARCHAR" property="wxEnterpriseId"/> <result column="wx_enterprise_id" jdbcType="VARCHAR" property="wxEnterpriseId"/>
<result column="title" jdbcType="VARCHAR" property="title"/> <result column="title" jdbcType="VARCHAR" property="title"/>
<result column="welcome_content" jdbcType="VARCHAR" property="welcomeContent"/> <result column="welcome_content" jdbcType="VARCHAR" property="welcomeContent"/>
<result column="welcome_img" jdbcType="VARCHAR" property="welcomeImg"/>
<result column="status_flag" jdbcType="INTEGER" property="statusFlag"/> <result column="status_flag" jdbcType="INTEGER" property="statusFlag"/>
<result column="open_flag" jdbcType="INTEGER" property="openFlag"/> <result column="open_flag" jdbcType="INTEGER" property="openFlag"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
welcome_id, wx_enterprise_id, title, welcome_content,open_flag, status_flag, create_time, update_time welcome_id, wx_enterprise_id, title, welcome_content,welcome_img,open_flag, status_flag, create_time, update_time
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_welcome from tab_haoban_welcome
where welcome_id = #{welcomeId,jdbcType=VARCHAR} where welcome_id = #{welcomeId,jdbcType=VARCHAR}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String"> <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from tab_haoban_welcome delete
from tab_haoban_welcome
where welcome_id = #{welcomeId,jdbcType=VARCHAR} where welcome_id = #{welcomeId,jdbcType=VARCHAR}
</delete> </delete>
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabWelcome"> <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
insert into tab_haoban_welcome (welcome_id, wx_enterprise_id, title, insert into tab_haoban_welcome (welcome_id, wx_enterprise_id, title,
welcome_content,open_flag, status_flag, create_time, welcome_content, welcome_img, open_flag, status_flag, create_time,
update_time) update_time)
values (#{welcomeId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, values (#{welcomeId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR},
#{welcomeContent,jdbcType=VARCHAR},#{openFlag}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{welcomeContent,jdbcType=VARCHAR}, #{welcomeImg,jdbcType=VARCHAR}, #{openFlag},
#{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}) #{updateTime,jdbcType=TIMESTAMP})
</insert> </insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
insert into tab_haoban_welcome
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="welcomeId != null">
welcome_id,
</if>
<if test="wxEnterpriseId != null">
wx_enterprise_id,
</if>
<if test="title != null">
title,
</if>
<if test="welcomeContent != null">
welcome_content,
</if>
<if test="statusFlag != null">
status_flag,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="welcomeId != null">
#{welcomeId,jdbcType=VARCHAR},
</if>
<if test="wxEnterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="title != null">
#{title,jdbcType=VARCHAR},
</if>
<if test="welcomeContent != null">
#{welcomeContent,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabWelcome"> <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
update tab_haoban_welcome update tab_haoban_welcome
<set> <set>
...@@ -93,6 +52,9 @@ ...@@ -93,6 +52,9 @@
<if test="welcomeContent != null"> <if test="welcomeContent != null">
welcome_content = #{welcomeContent,jdbcType=VARCHAR}, welcome_content = #{welcomeContent,jdbcType=VARCHAR},
</if> </if>
<if test="welcomeImg != null">
welcome_img = #{welcomeImg,jdbcType=VARCHAR},
</if>
<if test="openFlag != null"> <if test="openFlag != null">
open_flag = #{openFlag,jdbcType=INTEGER}, open_flag = #{openFlag,jdbcType=INTEGER},
</if> </if>
...@@ -108,17 +70,6 @@ ...@@ -108,17 +70,6 @@
</set> </set>
where welcome_id = #{welcomeId,jdbcType=VARCHAR} where welcome_id = #{welcomeId,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
update tab_haoban_welcome
set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
title = #{title,jdbcType=VARCHAR},
welcome_content = #{welcomeContent,jdbcType=VARCHAR},
open_flag = #{openFlag,jdbcType=INTEGER},
status_flag = #{statusFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where welcome_id = #{welcomeId,jdbcType=VARCHAR}
</update>
<select id="selectByWxEnterpriseId" parameterType="java.lang.String" resultMap="BaseResultMap"> <select id="selectByWxEnterpriseId" parameterType="java.lang.String" resultMap="BaseResultMap">
select select
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java
...@@ -73,11 +73,13 @@ public class LoginController extends WebBaseController { ...@@ -73,11 +73,13 @@ public class LoginController extends WebBaseController {
private Config config; private Config config;
@RequestMapping("login") @RequestMapping("login")
@Deprecated
public void login(String auth_code, HttpServletResponse response) { public void login(String auth_code, HttpServletResponse response) {
String userJson = qywxCorpApiService.getLoginUserInfo(config.getCorpid(), auth_code); String userJson = qywxCorpApiService.getLoginUserInfo(config.getCorpid(), auth_code);
if (StringUtils.isBlank(userJson)) { if (StringUtils.isBlank(userJson)) {
return; return;
} }
UserDTO user = JSON.parseObject(userJson, UserDTO.class); UserDTO user = JSON.parseObject(userJson, UserDTO.class);
String corpId = user.getCorpid(); String corpId = user.getCorpid();
logger.info("【企业微信登录】userId={},auth_code={},corpId={}", user.getUserid(), auth_code, corpId); logger.info("【企业微信登录】userId={},auth_code={},corpId={}", user.getUserid(), auth_code, corpId);
...@@ -117,10 +119,10 @@ public class LoginController extends WebBaseController { ...@@ -117,10 +119,10 @@ public class LoginController extends WebBaseController {
} catch (IOException e) { } catch (IOException e) {
logger.warn("异常", e); logger.warn("异常", e);
} }
} }
@RequestMapping("login_local") @RequestMapping("login_local")
@Deprecated
public HaobanResponse login() { public HaobanResponse login() {
LoginDTO loginVO = new LoginDTO(); LoginDTO loginVO = new LoginDTO();
...@@ -141,6 +143,7 @@ public class LoginController extends WebBaseController { ...@@ -141,6 +143,7 @@ public class LoginController extends WebBaseController {
* @return res * @return res
*/ */
@RequestMapping("get-login-info") @RequestMapping("get-login-info")
@Deprecated
public HaobanResponse getLoginInfo() { public HaobanResponse getLoginInfo() {
LoginDTO loginVO = (LoginDTO) AuthRequestUtil.getLoginUser(); LoginDTO loginVO = (LoginDTO) AuthRequestUtil.getLoginUser();
return resultResponse(HaoBanErrCode.ERR_1, loginVO); return resultResponse(HaoBanErrCode.ERR_1, loginVO);
...@@ -151,9 +154,7 @@ public class LoginController extends WebBaseController { ...@@ -151,9 +154,7 @@ public class LoginController extends WebBaseController {
String corpid = config.getCorpid(); String corpid = config.getCorpid();
String redirectUri = config.getHost() + "login"; String redirectUri = config.getHost() + "login";
String url = "https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect?appid=" + corpid + "&redirect_uri=" + URLEncoder.encode(redirectUri, "UTF-8") + "&state=web_login@gyoss9&usertype=admin"; String url = "https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect?appid=" + corpid + "&redirect_uri=" + URLEncoder.encode(redirectUri, "UTF-8") + "&state=web_login@gyoss9&usertype=admin";
//String url = qywxCorpApiService.getGrantAuthorizationUrl(siteId, redirectUri);
return resultResponse(HaoBanErrCode.ERR_1, URL.decode(url)); return resultResponse(HaoBanErrCode.ERR_1, URL.decode(url));
} }
/** /**
...@@ -196,7 +197,6 @@ public class LoginController extends WebBaseController { ...@@ -196,7 +197,6 @@ public class LoginController extends WebBaseController {
e.printStackTrace(); e.printStackTrace();
} }
return resultResponse(HaoBanErrCode.ERR_1); return resultResponse(HaoBanErrCode.ERR_1);
} }
/** /**
...@@ -290,7 +290,6 @@ public class LoginController extends WebBaseController { ...@@ -290,7 +290,6 @@ public class LoginController extends WebBaseController {
e.printStackTrace(); e.printStackTrace();
} }
return null; return null;
} }
@RequestMapping("login-wx-enterprise-list") @RequestMapping("login-wx-enterprise-list")
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
...@@ -12,11 +12,13 @@ import com.gic.enterprise.api.dto.StoreDTO; ...@@ -12,11 +12,13 @@ import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.EnterpriseService; import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.haoban.app.customer.dto.StaffOpenRelatedDTO; import com.gic.haoban.app.customer.dto.StaffOpenRelatedDTO;
import com.gic.haoban.app.customer.service.api.service.StaffMemberRelationApiService; import com.gic.haoban.app.customer.service.api.service.StaffMemberRelationApiService;
import com.gic.haoban.common.utils.AuthRequestUtil;
import com.gic.haoban.common.utils.EntityUtil; import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.*; import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.enums.SecretTypeEnum; import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.api.service.*; import com.gic.haoban.manage.api.service.*;
import com.gic.haoban.manage.api.utils.JwtUtil;
import com.gic.haoban.manage.web.config.Config; import com.gic.haoban.manage.web.config.Config;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.qo.ClerkLoginQO; import com.gic.haoban.manage.web.qo.ClerkLoginQO;
...@@ -40,10 +42,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -40,10 +42,7 @@ 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.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@RestController @RestController
...@@ -100,24 +99,24 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -100,24 +99,24 @@ public class WxEnterpriseInfoController extends WebBaseController {
String corpId = user.getCorpid(); String corpId = user.getCorpid();
WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId); WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
StaffDTO loginStaff = null; StaffDTO loginStaff = null;
if(enterprise != null){ if (enterprise != null) {
loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId,enterprise.getWxEnterpriseId()); loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId());
} }
if(loginStaff == null){ if (loginStaff == null) {
if(enterprise != null){ if (enterprise != null) {
staffApiService.wxGetAdd(userId,enterprise.getWxEnterpriseId()); staffApiService.wxGetAdd(userId, enterprise.getWxEnterpriseId());
loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId,enterprise.getWxEnterpriseId()); loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId());
} }
} }
if(loginStaff == null){ if (loginStaff == null) {
return resultResponse(HaoBanErrCode.ERR_600001); return resultResponse(HaoBanErrCode.ERR_600001);
} }
if (StringUtils.isNotBlank(loginStaff.getPhoneNumber())) { if (StringUtils.isNotBlank(loginStaff.getPhoneNumber())) {
DictDTO loginUserId = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getPhoneNumber()); DictDTO loginUserId = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getPhoneNumber());
logger.info("伪登录：{}，userId:{}",loginStaff.getPhoneNumber(), JSONObject.toJSONString(loginUserId)); logger.info("伪登录：{}，userId:{}", loginStaff.getPhoneNumber(), JSONObject.toJSONString(loginUserId));
if (null != loginUserId) { if (null != loginUserId) {
String val = loginUserId.getDictValue(); String val = loginUserId.getDictValue();
List<StaffDTO> staffDTOS=new ArrayList<>(); List<StaffDTO> staffDTOS = new ArrayList<>();
List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(val); List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(val);
List<StaffDTO> userDtos = staffApiService.listByWxUserId(val); List<StaffDTO> userDtos = staffApiService.listByWxUserId(val);
if (CollectionUtils.isNotEmpty(phoneDtos)) { if (CollectionUtils.isNotEmpty(phoneDtos)) {
...@@ -129,17 +128,16 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -129,17 +128,16 @@ public class WxEnterpriseInfoController extends WebBaseController {
if (CollectionUtils.isNotEmpty(staffDTOS)) { if (CollectionUtils.isNotEmpty(staffDTOS)) {
if (staffDTOS.size() > 1) { if (staffDTOS.size() > 1) {
String dictName = loginUserId.getDictName(); String dictName = loginUserId.getDictName();
loginStaff = staffDTOS.stream().filter(staffDTO -> { loginStaff = staffDTOS.stream().filter(staffDTO -> dictName.indexOf(staffDTO.getWxEnterpriseId()) > 0).findFirst().orElse(loginStaff);
return dictName.indexOf(staffDTO.getWxEnterpriseId()) > 0;
}).findFirst().orElse(loginStaff);
} else { } else {
loginStaff = staffDTOS.get(0); loginStaff = staffDTOS.get(0);
} }
} }
} }
} }
//激活状态 //激活状态
if(loginStaff.getActiveFlag()==0) { if (loginStaff.getActiveFlag() == 0) {
staffApiService.activeStaff(loginStaff.getStaffId()); staffApiService.activeStaff(loginStaff.getStaffId());
} }
...@@ -168,7 +166,33 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -168,7 +166,33 @@ public class WxEnterpriseInfoController extends WebBaseController {
*/ */
@RequestMapping(value = "welldone-login", method = RequestMethod.POST) @RequestMapping(value = "welldone-login", method = RequestMethod.POST)
public HaobanResponse welldoneLogin(@RequestBody ClerkLoginQO clerkLoginQO) { public HaobanResponse welldoneLogin(@RequestBody ClerkLoginQO clerkLoginQO) {
String phoneNumber = clerkLoginQO.getPhoneNumber();
ClerkDTO clerkDTO = clerkService.getClerkByPhoneNumber(phoneNumber);
if (clerkDTO == null) {
return resultResponse(HaoBanErrCode.ERR_6);
}
String clerkId = clerkDTO.getClerkId();
Map<String, String> map = new HashMap<>();
map.put("clerkId", clerkId);
map.put("enterpriseId", clerkDTO.getEnterpriseId());
map.put("isManager", clerkDTO.getClerkType() == 1 ? "1" : "0");
map.put("phoneNumber", phoneNumber);
String token = JwtUtil.genToken(map);
AuthRequestUtil.setAppLoginUser(JSON.toJSONString(map));
return resultResponse(HaoBanErrCode.ERR_1, token);
}
/**
* 令牌token刷新
*
* @return {@link HaobanResponse }
* @author mozhu
* @date 2021-12-10 18:34:12
*/
@RequestMapping("welldone-token-refresh")
public HaobanResponse welldoneTokenRefresh() {
AuthRequestUtil.setAppLoginUser(AuthRequestUtil.getAppLoginUser());
return resultResponse(HaoBanErrCode.ERR_1); return resultResponse(HaoBanErrCode.ERR_1);
} }
...@@ -179,6 +203,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -179,6 +203,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
*/ */
@RequestMapping("welldone-loginout") @RequestMapping("welldone-loginout")
public HaobanResponse welldoneLoginOut() { public HaobanResponse welldoneLoginOut() {
AuthRequestUtil.delSessionUser();
return resultResponse(HaoBanErrCode.ERR_1); return resultResponse(HaoBanErrCode.ERR_1);
} }
...@@ -253,7 +278,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -253,7 +278,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
StoreMemberVO VO = new StoreMemberVO(); StoreMemberVO VO = new StoreMemberVO();
StoreDTO store = storeService.getStore(dto.getStoreId()); StoreDTO store = storeService.getStore(dto.getStoreId());
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(dto.getClerkId()); ClerkDTO clerkDTO = clerkService.getClerkByClerkId(dto.getClerkId());
if (null != store&&clerkDTO!=null) { if (null != store && clerkDTO != null) {
VO.setUserId(staffDTO.getWxUserId()); VO.setUserId(staffDTO.getWxUserId());
VO.setStoreId(dto.getStoreId());//为空，则无该值 VO.setStoreId(dto.getStoreId());//为空，则无该值
VO.setStoreName(dto.getStoreName()); VO.setStoreName(dto.getStoreName());
...@@ -295,11 +320,11 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -295,11 +320,11 @@ public class WxEnterpriseInfoController extends WebBaseController {
@RequestMapping("get-member-store") @RequestMapping("get-member-store")
public HaobanResponse getMemberStore(String externalUserid, String wxUserId, String storeId) { public HaobanResponse getMemberStore(String externalUserid, String wxUserId, String storeId) {
if (StringUtils.isAnyBlank(externalUserid,wxUserId)) { if (StringUtils.isAnyBlank(externalUserid, wxUserId)) {
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
List<MemberStoreDTO> result = memberUnionidRelatedApiService.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, storeId); List<MemberStoreDTO> result = memberUnionidRelatedApiService.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, storeId);
return resultResponse(HaoBanErrCode.ERR_1,result); return resultResponse(HaoBanErrCode.ERR_1, result);
} }
@RequestMapping("get-staff-info") @RequestMapping("get-staff-info")
...@@ -308,19 +333,19 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -308,19 +333,19 @@ public class WxEnterpriseInfoController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_2); return resultResponse(HaoBanErrCode.ERR_2);
} }
List<StaffDTO> list = staffApiService.listByPhoneNumber(phoneNumber); List<StaffDTO> list = staffApiService.listByPhoneNumber(phoneNumber);
if(CollectionUtil.isNotEmpty(list)){ if (CollectionUtil.isNotEmpty(list)) {
List<AppStaffVo> staffs = EntityUtil.changeEntityListByJSON(AppStaffVo.class, list); List<AppStaffVo> staffs = EntityUtil.changeEntityListByJSON(AppStaffVo.class, list);
Set<String> wxEnterpriseIds = list.stream().map(s->s.getWxEnterpriseId()).collect(Collectors.toSet()); Set<String> wxEnterpriseIds = list.stream().map(s -> s.getWxEnterpriseId()).collect(Collectors.toSet());
List<YwWxEnterpriseDTO> enterprises = wxEnterpriseApiService.listByIds(wxEnterpriseIds); List<YwWxEnterpriseDTO> enterprises = wxEnterpriseApiService.listByIds(wxEnterpriseIds);
Map<String,YwWxEnterpriseDTO> map = com.gic.commons.util.CollectionUtil.toMap(enterprises, "wxEnterpriseId"); Map<String, YwWxEnterpriseDTO> map = com.gic.commons.util.CollectionUtil.toMap(enterprises, "wxEnterpriseId");
for(AppStaffVo vo:staffs){ for (AppStaffVo vo : staffs) {
String wxEnterpriseId = vo.getWxEnterpriseId(); String wxEnterpriseId = vo.getWxEnterpriseId();
String corpName = map.get(wxEnterpriseId) == null?"":map.get(wxEnterpriseId).getCorpName(); String corpName = map.get(wxEnterpriseId) == null ? "" : map.get(wxEnterpriseId).getCorpName();
vo.setWxEnterpriseName(corpName); vo.setWxEnterpriseName(corpName);
} }
return resultResponse(HaoBanErrCode.ERR_1,staffs); return resultResponse(HaoBanErrCode.ERR_1, staffs);
} }
return resultResponse(HaoBanErrCode.ERR_1,new ArrayList<>()); return resultResponse(HaoBanErrCode.ERR_1, new ArrayList<>());
} }
...@@ -379,6 +404,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -379,6 +404,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
/** /**
* 绑定好友 * 绑定好友
*
* @param memberId * @param memberId
* @param enterpriseId * @param enterpriseId
* @param unionid * @param unionid
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/interceptor/WebInterceptor.java
package com.gic.haoban.manage.web.interceptor; package com.gic.haoban.manage.web.interceptor;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.haoban.auth.api.anno.MenuCheck;
import com.gic.haoban.auth.api.dto.UserRightDetailDTO;
import com.gic.haoban.auth.api.enums.RoleCodeEnum;
import com.gic.haoban.auth.api.service.ClerkRightManageService;
import com.gic.haoban.common.utils.AuthRequestUtil; import com.gic.haoban.common.utils.AuthRequestUtil;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.web.anno.IgnoreLogin;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import org.apache.commons.lang3.StringUtils;
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.web.method.HandlerMethod;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
/** /**
...@@ -33,7 +23,7 @@ import java.util.Map; ...@@ -33,7 +23,7 @@ import java.util.Map;
*/ */
public class WebInterceptor extends HandlerInterceptorAdapter { public class WebInterceptor extends HandlerInterceptorAdapter {
private static Logger logger= LoggerFactory.getLogger(WebInterceptor.class); private static final Logger logger = LoggerFactory.getLogger(WebInterceptor.class);
private void errorResult(HttpServletResponse httpServletResponse, HaoBanErrCode errCode) { private void errorResult(HttpServletResponse httpServletResponse, HaoBanErrCode errCode) {
...@@ -56,28 +46,11 @@ public class WebInterceptor extends HandlerInterceptorAdapter { ...@@ -56,28 +46,11 @@ public class WebInterceptor extends HandlerInterceptorAdapter {
logger.info("post-url:{}", requestURI); logger.info("post-url:{}", requestURI);
Map<String, String[]> parameterMap = httpServletRequest.getParameterMap(); Map<String, String[]> parameterMap = httpServletRequest.getParameterMap();
logger.info("post-params:{}", JSONObject.toJSONString(parameterMap)); logger.info("post-params:{}", JSONObject.toJSONString(parameterMap));
Object appLoginUser = AuthRequestUtil.getAppLoginUser();
if (ObjectUtil.isNotNull(appLoginUser)) {
//TODO 登陆信息拦截 }
return true; return true;
// UserRightDetailDTO loginUser = (UserRightDetailDTO) AuthRequestUtil.getSessionUser();
//
// if (loginUser == null) {
// this.errorResult(httpServletResponse, HaoBanErrCode.ERR_4);
// logger.info("用户不存在!");
// return false;
// }
// HandlerMethod method = null;
// if (o instanceof HandlerMethod) {
// method = (HandlerMethod) (o);
// }
// if (method == null) {
// return true;
// }
// return true;
} }
@Override @Override
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/ClerkLoginQO.java
...@@ -17,5 +17,11 @@ public class ClerkLoginQO implements Serializable { ...@@ -17,5 +17,11 @@ public class ClerkLoginQO implements Serializable {
*/ */
private String phoneNumber; private String phoneNumber;
public String getPhoneNumber() {
return phoneNumber;
}
public void setPhoneNumber(String phoneNumber) {
this.phoneNumber = phoneNumber;
}
} }
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