Skip to content

S
smart_gov_platform
Commit 945f2d4f authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加mybatis xml映射文件

parent c8467853
Expand all Show whitespace changes
Inline Side-by-side
Showing with 6263 additions and 951 deletions
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @ 945f2d4f
......@@ -86,20 +86,9 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
recursionFn(areaMap, areaEntity);
}
}
return buildSiteTreeSelect(areaMap, siteMap);
}
@Override
public List<SiteTreeSelect> getSiteTree(Context context) {
return siteTreeList;
}
@Override
public void setSiteTree(List<SiteTreeSelect> list, Context context) {
this.siteTreeList = list;
}
public List<SiteTreeSelect> buildSiteTreeSelect(Map<String, AreaEntity> areaMap, Map<String, SiteEntity> siteMap) {
List<AreaEntity> areaList = areaMap.values().stream().collect(Collectors.toList());
List<AreaEntity> returnList = new ArrayList<>();
......@@ -112,10 +101,12 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
returnList.add(areaEntity);
}
}
//区域树
if (returnList.isEmpty()) {
returnList = areaList;
}
//构建站点树
List<SiteTreeSelect> collect = returnList.stream().map(item ->
new SiteTreeSelect(item, siteMap)
).collect(Collectors.toList());
......@@ -124,10 +115,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
}
private void recursion(List<AreaEntity> list, AreaEntity t) {
private void recursion(List<AreaEntity> list, AreaEntity entity) {
// 得到子节点列表
List<AreaEntity> childList = getChildList(list, t);
t.setChildren(childList);
List<AreaEntity> childList = getChildList(list, entity);
entity.setChildren(childList);
for (AreaEntity tChild : childList) {
if (hasChild(list, tChild)) {
recursion(list, tChild);
......@@ -138,8 +129,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
/**
* 得到子节点列表
*/
private List<AreaEntity> getChildList(List<AreaEntity> list, AreaEntity t) {
return list.stream().filter(item -> item.getPid().equals(t.getIid())).collect(Collectors.toList());
private List<AreaEntity> getChildList(List<AreaEntity> list, AreaEntity entity) {
return list.stream()
.filter(item -> item.getPid().equals(entity.getIid()))
.collect(Collectors.toList());
}
/**
......@@ -182,4 +175,14 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
new Thread(new SyncTreeSiteThread(this,context)).start();
super.removeBefore(ids, context);
}
@Override
public List<SiteTreeSelect> getSiteTree(Context context) {
return siteTreeList;
}
@Override
public void setSiteTree(List<SiteTreeSelect> list, Context context) {
this.siteTreeList = list;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @ 945f2d4f
package com.mortals.xhx.module.site.web;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException;
......@@ -17,10 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -78,6 +76,8 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
}
//校验
Long siteId = getContext().getUser().getSiteId();
String siteIds = getContext().getUser().getSiteIds();
Set<String> siteSet = Arrays.stream(siteIds.split(",")).collect(Collectors.toSet());
if(!ObjectUtils.isEmpty(siteId)){
//遍历树
SiteTreeSelect temp =reFucurs(siteTree,siteId.toString());
......@@ -118,4 +118,26 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
}
return temp;
}
/*
public SiteTreeSelect reFucurs(List<SiteTreeSelect> siteTree, Set<String> siteSet) {
SiteTreeSelect temp=null;
for (SiteTreeSelect site : siteTree) {
if (site.getId().equals(siteId)) {
log.info("curTree:{}", JSON.toJSONString(site));
temp=site;
break;
} else {
if (!ObjectUtils.isEmpty(site.getChildren())) {
temp=reFucurs(site.getChildren(), siteId);
if(temp!=null){
break;
}
}
}
}
return temp;
}*/
}
\ No newline at end of file
doc/政务一体化.docx
View file @ 945f2d4f
No preview for this file type
portal-manager/db/db.sql
View file @ 945f2d4f
......@@ -163,7 +163,7 @@ CREATE TABLE mortals_xhx_user(
`email` varchar(50) COMMENT '用户邮箱',
`qq` varchar(20) COMMENT 'QQ号码',
`userType` tinyint(2) COMMENT '用户类型，0：系统用户 1:普通用户 2:工作人员，默认2',
`siteInfo` varchar(500) COMMENT '{ "授权站点": { "站点信息": [ { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" } ] }}',
`siteIds` varchar(512) COMMENT '所属站点id,多个逗号分隔',
`status` tinyint(2) COMMENT '用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1',
`customerId` bigint(20) COMMENT '客户ID',
`createTime` datetime COMMENT '创建时间',
......@@ -173,6 +173,7 @@ CREATE TABLE mortals_xhx_user(
`lastLoginAddress` varchar(21) COMMENT '最后一次登录地址',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户信息业务';
-- ----------------------------
-- 验证码信息业务表
-- ----------------------------
......
portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserEntity.java
View file @ 945f2d4f
......@@ -9,11 +9,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.framework.service.IUser;
import com.mortals.xhx.module.user.model.vo.UserVo;
/**
* 用户信息业务实体对象
*
* @author zxfei
* @date 2022-05-25
*/
* 用户信息业务实体对象
*
* @author zxfei
* @date 2022-05-26
*/
public class UserEntity extends UserVo implements IUser {
private static final long serialVersionUID = 1L;
......@@ -55,9 +55,9 @@ public class UserEntity extends UserVo implements IUser {
*/
private Integer userType;
/**
* { "授权站点": { "站点信息": [ { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" } ] }}
* 所属站点id,多个逗号分隔
*/
private String siteInfo;
private String siteIds;
/**
* 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
*/
......@@ -225,18 +225,29 @@ public class UserEntity extends UserVo implements IUser {
this.userType = userType;
}
/**
* 获取 { "授权站点": { "站点信息": [ { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" } ] }}
* 获取 所属站点id,多个逗号分隔
* @return String
*/
public String getSiteInfo(){
return siteInfo;
public String getSiteIds(){
return siteIds;
}
@Override
public Long getCustomerJoinId() {
return null;
}
@Override
public String getCustomerNum() {
return null;
}
/**
* 设置 { "授权站点": { "站点信息": [ { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" } ] }}
* @param siteInfo
* 设置 所属站点id,多个逗号分隔
* @param siteIds
*/
public void setSiteInfo(String siteInfo){
this.siteInfo = siteInfo;
public void setSiteIds(String siteIds){
this.siteIds = siteIds;
}
/**
* 获取 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
......@@ -276,16 +287,6 @@ public class UserEntity extends UserVo implements IUser {
return null;
}
@Override
public Long getCustomerJoinId() {
return null;
}
@Override
public String getCustomerNum() {
return null;
}
/**
* 设置 客户ID
* @param customerId
......@@ -366,7 +367,7 @@ public class UserEntity extends UserVo implements IUser {
sb.append(",email:").append(getEmail());
sb.append(",qq:").append(getQq());
sb.append(",userType:").append(getUserType());
sb.append(",siteInfo:").append(getSiteInfo());
sb.append(",siteIds:").append(getSiteIds());
sb.append(",status:").append(getStatus());
sb.append(",customerId:").append(getCustomerId());
sb.append(",createUserName:").append(getCreateUserName());
......@@ -395,7 +396,7 @@ public class UserEntity extends UserVo implements IUser {
this.userType = null;
this.siteInfo = "";
this.siteIds = "";
this.status = 1;
......
portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserQuery.java
View file @ 945f2d4f
......@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.user.model.UserEntity;
/**
* 用户信息业务查询对象
*
* @author zxfei
* @date 2022-05-25
*/
* 用户信息业务查询对象
*
* @author zxfei
* @date 2022-05-26
*/
public class UserQuery extends UserEntity {
/** 开始 用户ID，主键，自增长 */
private Long idStart;
......@@ -58,8 +58,8 @@ public class UserQuery extends UserEntity {
/** 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2列表 */
private List <Integer> userTypeList;
/** { "授权站点": { "站点信息": [ { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" } ] }} */
private List<String> siteInfoList;
/** 所属站点id,多个逗号分隔 */
private List<String> siteIdsList;
/** 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 */
private Integer statusStart;
......@@ -372,19 +372,19 @@ public class UserQuery extends UserEntity {
}
/**
* 获取 { "授权站点": { "站点信息": [ { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" } ] }}
* @return siteInfoList
* 获取 所属站点id,多个逗号分隔
* @return siteIdsList
*/
public List<String> getSiteInfoList(){
return this.siteInfoList;
public List<String> getSiteIdsList(){
return this.siteIdsList;
}
/**
* 设置 { "授权站点": { "站点信息": [ { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" } ] }}
* @param siteInfoList
* 设置 所属站点id,多个逗号分隔
* @param siteIdsList
*/
public void setSiteInfoList(List<String> siteInfoList){
this.siteInfoList = siteInfoList;
public void setSiteIdsList(List<String> siteIdsList){
this.siteIdsList = siteIdsList;
}
/**
* 获取 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
......@@ -916,20 +916,20 @@ public class UserQuery extends UserEntity {
/**
* 设置 { "授权站点": { "站点信息": [ { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" } ] }}
* @param siteInfo
* 设置 所属站点id,多个逗号分隔
* @param siteIds
*/
public UserQuery siteInfo(String siteInfo){
setSiteInfo(siteInfo);
public UserQuery siteIds(String siteIds){
setSiteIds(siteIds);
return this;
}
/**
* 设置 { "授权站点": { "站点信息": [ { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" }, { "站点ID": "1", "站点名称": "1", "站点对应的区域ID": "", "站点对应的区域名称": "" } ] }}
* @param siteInfoList
* 设置 所属站点id,多个逗号分隔
* @param siteIdsList
*/
public UserQuery siteInfoList(List<String> siteInfoList){
this.siteInfoList = siteInfoList;
public UserQuery siteIdsList(List<String> siteIdsList){
this.siteIdsList = siteIdsList;
return this;
}
......
portal-manager/src/main/resources/sqlmap/module/param/paramExt.xml 0 → 100644
View file @ 945f2d4f
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.param.dao.ibatis.ParamDaoImpl">
<update id="update-param-version">
update mortals_xhx_param set paramValue=paramValue+1 where paramKey='param_refresh_count'
</update>
</mapper>
\ No newline at end of file
portal-manager/src/main/resources/sqlmap/module/resource/resourceExt.xml 0 → 100644
View file @ 945f2d4f
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.resource.dao.ibatis.ResourceDaoImpl">
<!-- 获取列表 -->
<select id="getListByUserId" parameterType="paramDto" resultMap="ResourceEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_resource as a
where a.authType in(0,1,2) or a.id IN
(select resourceId
from mortals_xhx_role_auth as b
left join mortals_xhx_role_user as c
on b.roleId=c.roleId
where c.userId=#{condition.userId})
</select>
<select id="getAllByUserType" parameterType="java.util.HashMap" resultMap="ResourceEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_resource as a
where a.userType=#{userType}
</select>
</mapper>
\ No newline at end of file
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