Skip to content

M
map-parent
Commit 2771da6d by yangyang
Options

重庆登录相关、意见反馈提交(重庆)

parent 626f02b7
Showing with 35 additions and 112 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SysUser.java
......@@ -46,9 +46,6 @@ public class SysUser extends Model<SysUser> {
*/
private String openFlag;
private String defaultModel;
private String remark;
/**
* 录入人
*/
......@@ -59,23 +56,6 @@ public class SysUser extends Model<SysUser> {
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date lrsj;
/**
* 改写人
*/
private String gxr;
/**
* 改写时间
*/
@DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
private Date gxsj;
/**
* 录入单位代码
*/
private String lrdwdm;
/**
* 录入单位名称
*/
private String lrdwmc;
/**
* 用户证件号码
*/
private String identitycard;
......@@ -113,51 +93,6 @@ public class SysUser extends Model<SysUser> {
*/
private String policemanid;
private Integer defaultDesktop;
private String theme;
private Date lastlogintime;
private Date lastchecktime;
/**
* 信息资源授权字符串
*/
private String xxzyurl;
/**
* 工作桌面指挥员模块id
*/
private String gzzmZhy;
/**
* 工作桌面研判员员模块id
*/
private String gzzmYpy;
/**
* 工作桌面侦查员模块id
*/
private String gzzmZcy;
/**
* 用户角色
*/
private String gzzmPlay;
/**
* 管理员判断标志 00：否 01：是
*/
private String glybz;
/**
* 特权用户判断标志 00：否 01：是
*/
private String tqyhbz;
private String jgzPhotoZm;
private String jgzPhotoFm;
private String zbzxDwdm;
private String grdf;
/**
* 获取主键值
*
......
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SysUsers.java
package com.founder.commonutils.model.newPublicEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -8,7 +9,6 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
......@@ -46,40 +46,7 @@ public class SysUsers implements Serializable {
@ApiModelProperty(value = "密码")
private String password;
@ApiModelProperty(value = "权限0 是编辑新增删除（所有权限）1：新增修改自己的 2：查看自己的")
private String jurisdiction;
@ApiModelProperty(value = "更新时间")
private Date gxsj;
@ApiModelProperty(value = "入库时间")
private Date rksj;
@ApiModelProperty(value = "信息来源描述")
private String xxlyms;
@ApiModelProperty(value = "职务")
private String jobname;
@ApiModelProperty(value = "xxsc_pdbz")
private String xxsc_pdbz;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入单位代码")
private String lrdwdm;
@ApiModelProperty(value = "录入单位名称")
private String lrdwmc;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新单位代码")
private String gxdwdm;
@ApiModelProperty(value = "更新单位名称")
private String gxdwmc;
@TableField("scbz")
private String scbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/cqEntity/KsjTableResult.java
......@@ -24,6 +24,8 @@ public class KsjTableResult {
private List<Title> title;// 表头
private List<Search> search;// 查询条件
@Data
public static class Title {
private String prop;// 标签（对应数据库字段）
......@@ -32,5 +34,13 @@ public class KsjTableResult {
private String type;// 日期为date 其他的都为text类型
private String ishead;// 是否为默认展示表头，0是，1否
}
@Data
public static class Search {
private String prop;// 标签（对应数据库字段）
private String label;// 标签（对应的字段注释）
private boolean search;// True/false true得即为查询条件
private String type;// 日期为date 其他的都为text类型
}
}
}
common/common_utils/src/main/java/com/founder/commonutils/util/cqInterfaceUtil.java
......@@ -47,15 +47,21 @@ public class cqInterfaceUtil {
KsjTableResult.Rows rows = new KsjTableResult.Rows();
rows.setTabsName(key);
rows.setUrl(value.get(0).getUrl());
List<KsjTableResult.Rows.Search> searchList = new ArrayList<>();
List<KsjTableResult.Rows.Title> titleList = new ArrayList<>();
value.stream().forEach(p->{
KsjTableResult.Rows.Title title = new KsjTableResult.Rows.Title();
KsjTableResult.Rows.Search search = new KsjTableResult.Rows.Search();
BeanUtils.copyProperties(p,title);
BeanUtils.copyProperties(p,search);
if(p.getIssearch().equals("0")){
title.setSearch(true);
search.setSearch(true);
searchList.add(search);
}
titleList.add(title);
});
rows.setSearch(searchList);
rows.setTitle(titleList);
rowsList.add(rows);
});
......
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
......@@ -21,6 +21,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Base64;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
......@@ -65,14 +66,14 @@ public class SysUserController extends ApiController {
}
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("USERNAME", username);
queryWrapper.eq("PASSWORD", DigestUtil.encrypt(password));
queryWrapper.eq("PASSWORD", Base64.getEncoder().encodeToString(password.getBytes()));
queryWrapper.eq("SCBZ", 0);
SysUser one = sysUserService.getOne(queryWrapper);
if (one == null) {
return MapRestResult.build(500, "该用户不存在", null);
}
if (!DigestUtil.encrypt(password).equals(one.getPassword())) {
if (!Base64.getEncoder().encodeToString(password.getBytes()).equals(one.getPassword())) {
return MapRestResult.build(500, "账号、密码不正确", null);
}
// 拿到真实ip
......@@ -80,7 +81,7 @@ public class SysUserController extends ApiController {
JwtUser util = new JwtUser();
String ip = request.getRemoteAddr();
//密码加密与刑专一致
Token tokenEntity=new Token(one.getUsername(),one.getIp(), DigestUtil.encrypt(password));
Token tokenEntity=new Token(one.getUsername(),one.getIp(), Base64.getEncoder().encodeToString(password.getBytes()));
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tokenEntity);
//用户JWT生成token
String token = util.createJWT(jsonObject.toString());
......
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SysUserMapper.java → common/service_base/src/main/java/com/founder/servicebase/mapper/qgxzMapper/SysUserMapper.java
package com.founder.servicebase.mapper.mysqlMapper;
package com.founder.servicebase.mapper.qgxzMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.SysUser;
......
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/xml/SysUsersMapper.xml → common/service_base/src/main/java/com/founder/servicebase/mapper/qgxzMapper/xml/SysUsersMapper.xml
<?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">
<mapper namespace="com.founder.servicebase.mapper.mysqlMapper.SysUserMapper">
<mapper namespace="com.founder.servicebase.mapper.qgxzMapper.SysUserMapper">
<select id="getUsersByNamePassword" resultType="com.founder.commonutils.model.newPublicEntity.SysUsers">
select * from sys_users
where 1=1 and xxsc_pdbz = '0'
select * from sys_user
where 1=1 and scbz = '0'
<if test="username!=null and username!=''">
and username = #{username}
</if>
......
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SysUserServiceImpl.java
......@@ -4,7 +4,7 @@ package com.founder.servicebase.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.servicebase.mapper.mysqlMapper.SysUserMapper;
import com.founder.servicebase.mapper.qgxzMapper.SysUserMapper;
import com.founder.servicebase.service.SysUserService;
import org.springframework.stereotype.Service;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SuggestionService/CommentController.java
......@@ -3,7 +3,9 @@ package com.founder.publicapi.controller.SuggestionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SkypDesktopEntity.SkMenu;
import com.founder.commonutils.model.newPublicEntity.suggestionEntity.CommentEntity;
import com.founder.commonutils.model.newPublicEntity.suggestionEntity.PaperEntity;
import com.founder.commonutils.util.KeyUtilNaotu;
import com.founder.publicapi.mapper.mysqlMapper.CommentMapper;
import com.founder.servicebase.logs.OperLog;
......@@ -121,17 +123,19 @@ public class CommentController {
}
// 子评论加入到父评论的 child 中
for(CommentEntity comment : list) {
List<CommentEntity> child = new ArrayList<>();
String id = comment.getParentId();
if(id != null) { // 当前评论为子评论
CommentEntity name = commentMapper.selectById(id);
comment.setParentName(name.getUserName());
CommentEntity p = map.get(id);
if(p.getChild() == null) { // child 为空，则创建
p.setChild(new ArrayList<>());
child.add(comment);
p.setChild(child);
}else {
p.getChild().add(comment);
}
}
}
......
service/publicapi/src/main/resources/bootstrap-prod.properties
......@@ -44,7 +44,7 @@ approvalDownloadTemplate = http://77.1.24.19:1009/excel/approvalWord/ApprovalWor
#\u4FE1\u606F\u53CD\u9988\u4E0A\u4F20\u7684\u8DEF\u5F84
suggestionFilePath = /data/excel/suggestion/
#\u4FE1\u606F\u53CD\u9988\u4E0B\u8F7D\u8DEF\u5F84
suggestionDownload = http://47.92.48.137:1009/excel/suggestion/
suggestionDownload = http://77.1.24.19:1009/excel/suggestion/
#\u8D44\u6E90\u7BA1\u7406\u4E0A\u4F20\u8DEF\u5F84
ResourceManagerUpload = /data/excel/ResourceManager/
......
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