Skip to content

C
chuanshan_gov_platform
Commit b6d80801 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

达州一窗服务知识库系统

parent 3e46a91d
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 424 deletions
knowledge-base/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java
View file @ b6d80801
......@@ -9,6 +9,7 @@ import com.mortals.framework.util.AESUtil;
import com.mortals.framework.utils.ServletUtils;
import com.mortals.framework.web.interceptor.BaseInterceptor;
import com.mortals.xhx.base.framework.config.InterceptorConfig;
import com.mortals.xhx.common.key.Constant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
......@@ -72,7 +73,7 @@ public class AuthUserInterceptor extends BaseInterceptor {
if (ObjectUtils.isEmpty(loginUser)) {
ServletUtils.renderString(response, JSONObject.toJSONString(Rest.fail(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT)));
return false;
} else if (loginUser.isAdmin() || loginUser.getUserType() == 1) {
} else if (loginUser.isAdmin() || loginUser.getUserType() == 1||loginUser.getUserType()== Constant.WORKMAN_USER) {
return super.preHandle(request, response, handler);
} else {
ServletUtils.renderString(response, JSONObject.toJSONString(Rest.fail(ERROR_USER_OPERATION, ERROR_USER_OPERATION_CONTENT)));
......
knowledge-base/src/main/java/com/mortals/xhx/common/key/Constant.java
View file @ b6d80801
......@@ -139,6 +139,7 @@ public final class Constant {
public final static String USER_SITE_TREE = "user:site:tree";
/** 登录用户类型为工作人员 */
public final static int WORKMAN_USER = 99;
}
knowledge-base/src/main/java/com/mortals/xhx/module/site/web/SiteMatterAssistController.java
View file @ b6d80801
......@@ -4,7 +4,10 @@ import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.OperTypeEnum;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.module.site.model.SiteMatterAssistViewsEntity;
import com.mortals.xhx.module.site.model.SiteMatterEntity;
import com.mortals.xhx.module.site.service.SiteMatterAssistViewsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -18,12 +21,10 @@ import com.mortals.xhx.module.site.model.SiteMatterAssistEntity;
import com.mortals.xhx.module.site.service.SiteMatterAssistService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
......@@ -40,6 +41,8 @@ public class SiteMatterAssistController extends BaseCRUDJsonBodyMappingControlle
@Autowired
private ParamService paramService;
@Autowired
private SiteMatterAssistViewsService siteMatterAssistViewsService;
public SiteMatterAssistController(){
super.setModuleDesc( "辅助接件事项");
......@@ -69,6 +72,17 @@ public class SiteMatterAssistController extends BaseCRUDJsonBodyMappingControlle
@Override
protected int viewAfter(Long id, Map<String, Object> model, SiteMatterAssistEntity entity, Context context) throws AppException {
this.service.addViewsCount(id);
if(context!=null && context.getUser()!=null){
if(context.getUser().getUserType()== Constant.WORKMAN_USER){
SiteMatterAssistViewsEntity siteMatterAssistViewsEntity = new SiteMatterAssistViewsEntity();
siteMatterAssistViewsEntity.setAssistId(id);
siteMatterAssistViewsEntity.setViewUserId(context.getUser().getId());
siteMatterAssistViewsEntity.setViewUserName(context.getUser().getRealName());
siteMatterAssistViewsEntity.setCreateTime(new Date());
siteMatterAssistViewsEntity.setCreateUserId(1L);
siteMatterAssistViewsService.save(siteMatterAssistViewsEntity);
}
}
return 1;
}
......
knowledge-base/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java
View file @ b6d80801
package com.mortals.xhx.module.workman.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.service.IUser;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.module.workman.model.vo.WorkmanVo;
import lombok.Data;
import java.util.Date;
......@@ -11,10 +15,15 @@ import java.util.Date;
* @author zxfei
* @date 2022-12-23
*/
public class WorkmanEntity extends WorkmanVo {
@Data
public class WorkmanEntity extends WorkmanVo implements IUser {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
@JSONField(serialize = false)
private String token;
/**
* 登录用户名
*/
......@@ -147,417 +156,6 @@ public class WorkmanEntity extends WorkmanVo {
private String operatorId;
public WorkmanEntity(){}
/**
* 获取 登录用户名
* @return String
*/
public String getLoginName(){
return loginName;
}
/**
* 设置 登录用户名
* @param loginName
*/
public void setLoginName(String loginName){
this.loginName = loginName;
}
/**
* 获取 密码
* @return String
*/
public String getLoginPwd(){
return loginPwd;
}
/**
* 设置 密码
* @param loginPwd
*/
public void setLoginPwd(String loginPwd){
this.loginPwd = loginPwd;
}
/**
* 获取 部门id号
* @return Long
*/
public Long getDeptId(){
return deptId;
}
/**
* 设置 部门id号
* @param deptId
*/
public void setDeptId(Long deptId){
this.deptId = deptId;
}
/**
* 获取 部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 窗口id号
* @return Long
*/
public Long getWindowId(){
return windowId;
}
/**
* 设置 窗口id号
* @param windowId
*/
public void setWindowId(Long windowId){
this.windowId = windowId;
}
/**
* 获取 窗口名称
* @return String
*/
public String getWindowName(){
return windowName;
}
/**
* 设置 窗口名称
* @param windowName
*/
public void setWindowName(String windowName){
this.windowName = windowName;
}
/**
* 获取 站点ID
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 站点名称
* @return String
*/
public String getSiteName(){
return siteName;
}
/**
* 设置 站点名称
* @param siteName
*/
public void setSiteName(String siteName){
this.siteName = siteName;
}
/**
* 获取 姓名
* @return String
*/
public String getName(){
return name;
}
/**
* 设置 姓名
* @param name
*/
public void setName(String name){
this.name = name;
}
/**
* 获取 工号
* @return String
*/
public String getNumber(){
return number;
}
/**
* 设置 工号
* @param number
*/
public void setNumber(String number){
this.number = number;
}
/**
* 获取 职务
* @return String
*/
public String getUserpost(){
return userpost;
}
/**
* 设置 职务
* @param userpost
*/
public void setUserpost(String userpost){
this.userpost = userpost;
}
/**
* 获取 职称
* @return String
*/
public String getPosttitle(){
return posttitle;
}
/**
* 设置 职称
* @param posttitle
*/
public void setPosttitle(String posttitle){
this.posttitle = posttitle;
}
/**
* 获取 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)
* @return Integer
*/
public Integer getPoliticalstatus(){
return politicalstatus;
}
/**
* 设置 政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)
* @param politicalstatus
*/
public void setPoliticalstatus(Integer politicalstatus){
this.politicalstatus = politicalstatus;
}
/**
* 获取 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
* @return Integer
*/
public Integer getDangyuan(){
return dangyuan;
}
/**
* 设置 党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)
* @param dangyuan
*/
public void setDangyuan(Integer dangyuan){
this.dangyuan = dangyuan;
}
/**
* 获取 党员扩展
* @return String
*/
public String getDangyuanext(){
return dangyuanext;
}
/**
* 设置 党员扩展
* @param dangyuanext
*/
public void setDangyuanext(String dangyuanext){
this.dangyuanext = dangyuanext;
}
/**
* 获取 身份证
* @return String
*/
public String getIdCard(){
return idCard;
}
/**
* 设置 身份证
* @param idCard
*/
public void setIdCard(String idCard){
this.idCard = idCard;
}
/**
* 获取 电话
* @return String
*/
public String getPhone(){
return phone;
}
/**
* 设置 电话
* @param phone
*/
public void setPhone(String phone){
this.phone = phone;
}
/**
* 获取 手机
* @return String
*/
public String getMobile(){
return mobile;
}
/**
* 设置 手机
* @param mobile
*/
public void setMobile(String mobile){
this.mobile = mobile;
}
/**
* 获取 星级
* @return Integer
*/
public Integer getStarlevel(){
return starlevel;
}
/**
* 设置 星级
* @param starlevel
*/
public void setStarlevel(Integer starlevel){
this.starlevel = starlevel;
}
/**
* 获取 个人简介
* @return String
*/
public String getSummary(){
return summary;
}
/**
* 设置 个人简介
* @param summary
*/
public void setSummary(String summary){
this.summary = summary;
}
/**
* 获取 照片
* @return String
*/
public String getPhotoPath(){
return photoPath;
}
/**
* 设置 照片
* @param photoPath
*/
public void setPhotoPath(String photoPath){
this.photoPath = photoPath;
}
/**
* 获取 岗位职责
* @return String
*/
public String getDuty(){
return duty;
}
/**
* 设置 岗位职责
* @param duty
*/
public void setDuty(String duty){
this.duty = duty;
}
/**
* 获取 服务承诺
* @return String
*/
public String getPromise(){
return promise;
}
/**
* 设置 服务承诺
* @param promise
*/
public void setPromise(String promise){
this.promise = promise;
}
/**
* 获取 办理事项
* @return String
*/
public String getBusiness(){
return business;
}
/**
* 设置 办理事项
* @param business
*/
public void setBusiness(String business){
this.business = business;
}
/**
* 获取 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）
* @return Integer
*/
public Integer getOnline(){
return online;
}
/**
* 设置 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）
* @param online
*/
public void setOnline(Integer online){
this.online = online;
}
/**
* 获取 配置站点模块，逗号分隔
* @return String
*/
public String getModelIds(){
return modelIds;
}
/**
* 设置 配置站点模块，逗号分隔
* @param modelIds
*/
public void setModelIds(String modelIds){
this.modelIds = modelIds;
}
/**
* 获取 最后一次登录时间
* @return Date
*/
public Date getLastLoginTime(){
return lastLoginTime;
}
/**
* 设置 最后一次登录时间
* @param lastLoginTime
*/
public void setLastLoginTime(Date lastLoginTime){
this.lastLoginTime = lastLoginTime;
}
/**
* 获取 最后一次登录地址
* @return String
*/
public String getLastLoginAddress(){
return lastLoginAddress;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddress
*/
public void setLastLoginAddress(String lastLoginAddress){
this.lastLoginAddress = lastLoginAddress;
}
/**
* 获取 一体化经办人id
* @return String
*/
public String getOperatorId(){
return operatorId;
}
/**
* 设置 一体化经办人id
* @param operatorId
*/
public void setOperatorId(String operatorId){
this.operatorId = operatorId;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -665,4 +263,74 @@ public class WorkmanEntity extends WorkmanVo {
this.lastLoginAddress = null;
}
@Override
public Long getCustomerId() {
return null;
}
@Override
public String getSiteIds() {
return null;
}
@Override
public String getAreaCodes() {
return null;
}
@Override
public Long getCustomerJoinId() {
return null;
}
@Override
public String getCustomerNum() {
return null;
}
@Override
public String getRealName() {
return this.name;
}
@Override
public boolean isAdmin() {
return false;
}
@Override
public boolean isSystemUser() {
return false;
}
@Override
public boolean isManager() {
return false;
}
@Override
public Integer getUserType() {
return Constant.WORKMAN_USER;
}
@Override
public Long getLoginTime() {
return null;
}
@Override
public Long getExpireTime() {
return null;
}
@Override
public void setExpireTime(Long expireTime) {
}
@Override
public String getMenuUrl() {
return null;
}
}
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
View file @ b6d80801
package com.mortals.xhx.module.workman.web;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.alibaba.fastjson.JSON;
......@@ -9,6 +10,7 @@ import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.FileUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
......@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -79,14 +82,22 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
JSONObject ret = new JSONObject();
try {
String ip = super.getRequestIP(request);
Map<String, Object> data = new HashMap<>();
WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip);
if (query.getSiteId() != workmanEntity.getSiteId()) {
throw new AppException("当前工作人员不在当前站点下！");
}
// if (query.getSiteId() != workmanEntity.getSiteId()) {
// throw new AppException("当前工作人员不在当前站点下！");
// }
workmanEntity.setLastLoginAddress(ip);
//workmanEntity.setLoginTime(System.currentTimeMillis());
workmanEntity.setToken(IdUtil.fastSimpleUUID());
workmanEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
String token = authTokenService.createToken(workmanEntity);
data.put("token", token);
data.put("workmanEntity", workmanEntity);
ret.put(KEY_RESULT_DATA, data);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "工作人员登录成功！");
ret.put(KEY_RESULT_DATA, workmanEntity);
recordSysLog(request, getCurUser(), "工作人员登录成功!");
recordSysLog(request, workmanEntity, "工作人员登录成功!");
return ret.toJSONString();
} catch (Exception e) {
log.error("工作人员登录错误", e);
......
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