Skip to content

S
smart_gov_platform
Commit 5ec8f9f4 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

parents 58e3eda7 1d640e10
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 31 deletions
base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
View file @ 5ec8f9f4
......@@ -27,6 +27,7 @@ import com.mortals.xhx.base.system.menu.model.MenuEntity;
import com.mortals.xhx.base.system.menu.service.MenuService;
import com.mortals.xhx.base.system.resource.model.ResourceEntity;
import com.mortals.xhx.base.system.resource.service.ResourceService;
import com.mortals.xhx.base.system.role.model.RoleUserEntity;
import com.mortals.xhx.base.system.role.model.RoleUserQuery;
import com.mortals.xhx.base.system.role.service.RoleUserService;
import com.mortals.xhx.base.system.user.dao.UserDao;
......@@ -273,6 +274,18 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
return super.find(params, pageInfo, null);
}
@Override
protected void findAfter(UserEntity params, PageInfo pageInfo, Context context, List<UserEntity> list) throws AppException {
list.stream().peek(item -> {
RoleUserQuery roleUserQuery = new RoleUserQuery();
roleUserQuery.setUserId(item.getId());
String roleIds = roleUserService.find(roleUserQuery).stream().map(RoleUserEntity::getRoleId).map(String::valueOf).collect(Collectors.joining(","));
item.setRoleIds(roleIds);
}).count();
super.findAfter(params, pageInfo, context, list);
}
@Override
public UserEntity createUser(IUser currUser, Long customerId, String customerName, String loginName, String password,
String userName, String mobile) throws AppException {
......
base-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java
View file @ 5ec8f9f4
......@@ -11,6 +11,11 @@ import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.framework.web.BaseCRUDJsonMappingController;
import com.mortals.xhx.base.framework.annotation.Operlog;
import com.mortals.xhx.base.system.role.model.RoleQuery;
import com.mortals.xhx.base.system.role.model.RoleUserEntity;
import com.mortals.xhx.base.system.role.model.RoleUserQuery;
import com.mortals.xhx.base.system.role.service.RoleService;
import com.mortals.xhx.base.system.role.service.RoleUserService;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.UserStatus;
......@@ -26,6 +31,7 @@ import javax.servlet.http.HttpServletResponse;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 用户信息
......@@ -37,6 +43,12 @@ import java.util.Map;
@RequestMapping("user")
public class UserController extends BaseCRUDJsonBodyMappingController<UserService, UserEntity, Long> {
@Autowired
private RoleService roleService;
@Autowired
private RoleUserService roleUserService;
public UserController() {
super.setModuleDesc("用户信息");
}
......@@ -46,6 +58,8 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
Map<String, Object> statsus = new HashMap<String, Object>();
statsus.put("userType", IBaseEnum.getEnumMap(UserType.class));
statsus.put("status", UserStatus.getEnumMap());
this.addDict(model, "roleIds", roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName())));
model.put(KEY_RESULT_DICT, statsus);
}
......@@ -59,14 +73,15 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
}
}
/* @Override
protected void saveBefore(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
if (!ObjectUtils.isEmpty(entity.getLoginName())&&service.existUser(entity.getLoginName(), entity.getId())) {
throw new AppException("登录名已存在！");
}
super.saveBefore(entity, model, context);
}*/
@Override
protected int editAfter(Long id, Map<String, Object> model, UserEntity entity, Context context) throws AppException {
RoleUserQuery roleUserQuery = new RoleUserQuery();
roleUserQuery.setUserId(entity.getId());
String roleIds = roleUserService.find(roleUserQuery).stream().map(RoleUserEntity::getRoleId).map(String::valueOf).collect(Collectors.joining(","));
entity.setRoleIds(roleIds);
return super.editAfter(id, model, entity, context);
}
@RequestMapping(value = "change/password", method = RequestMethod.POST)
@Operlog(msg = "密码修改成功!")
......
base-manager/src/main/java/com/mortals/xhx/common/utils/MatterDetailHtmlParseUtil.java
View file @ 5ec8f9f4
......@@ -464,7 +464,8 @@ public class MatterDetailHtmlParseUtil {
// String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0151400000-511500000000-000-511501-7-1-00&taskType=1&deptCode=511501-7";
// String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0000400004-511500000000-000-1151120000870212XU-1-00&taskType=1&deptCode=3922757070285361152";
String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=512036008003-511500000000-000-11511200MB1503849K-1-00&taskType=20&deptCode=3907787168696946688";
// String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=512036008003-511500000000-000-11511200MB1503849K-1-00&taskType=20&deptCode=3907787168696946688";
String url = "https://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0101600004-511500000000-000-11511200008702584B-1-00&taskType=1&deptCode=511501-7";
Document dom = MatterDetailHtmlParseUtil.getDomByHtml(url);
Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ 5ec8f9f4
......@@ -1426,7 +1426,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
StringBuilder sb1 = new StringBuilder();
for (Map.Entry<String, String> entry : baseInfoMap.entrySet()) {
if(sb1.length()>360){
if (sb1.length() > 360) {
sb.append(sb1);
sb.append("\n");
sb1 = new StringBuilder();
......@@ -1443,7 +1443,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
for (Map<String, Object> sqclMap : sqclList) {
Map<String, String> baseinfoMap = (HashMap<String, String>) sqclMap.get("baseinfo");
for (Map.Entry<String, String> entry : baseinfoMap.entrySet()) {
if(!"材料名称".equals(entry.getKey())){
if (!"材料名称".equals(entry.getKey())) {
continue;
}
sb.append(entry.getKey()).append(" ").append(entry.getValue());
......@@ -1509,7 +1509,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
List<Map<String, Object>> cjwtMapList = MatterDetailHtmlParseUtil.getCjwtMapByHtml(dom);
for (Map<String, Object> bllcMap : cjwtMapList) {
for (Map.Entry<String, Object> entry : bllcMap.entrySet()) {
if(sb3.length()>360){
if (sb3.length() > 360) {
sb.append(sb3);
sb.append("\n");
sb3 = new StringBuilder();
......@@ -1521,7 +1521,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
}
sb.append(sb3);
strList.add(sb.toString());
log.info("事项名称:{}",matterEntity.getMatterName());
log.info("事项名称:{}", matterEntity.getMatterName());
break;
} catch (Exception e) {
log.error("异常", e);
......@@ -1537,7 +1537,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
//todo 实时爬取后组合
String path = "E:\\temp.csv";
FileUtil.writeUtf8Lines(strList,path);
FileUtil.writeUtf8Lines(strList, path);
return Rest.ok();
}
......@@ -1563,27 +1563,76 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
.timeout(60 * 1000).get();
//基本属性
sb.append("# "+matterEntity.getMatterName()+"\n");
sb.append("# " + matterEntity.getMatterName() + "\n");
sb.append("\n");
sb.append("## 基本信息\n");
Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
/**
* | **服务对象** | 自然人 |
* |---: |--- |
* | **法定时限办结说明** | 自受理之日起，在法定期限内办结 |
* | **是否收费** | 否 |
*/
boolean bool = false;
for (Map.Entry<String, String> entry : baseInfoMap.entrySet()) {
sb.append(entry.getKey()).append(" ").append(entry.getValue());
sb.append(String.format("| **%s** \t| %s \t|", entry.getKey(), entry.getValue()));
sb.append("\n");
if (!bool) {
sb.append("|---:\t|---\t|");
sb.append("\n");
bool = false;
}
/* sb.append(entry.getKey()).append(" ").append(entry.getValue());
sb.append("\n");*/
}
sb.append("\n");
//更新材料属性
sb.append("## 申请材料\n");
/**
* | | **材料名称** | **材料必要性** | **原件和复印件** | **纸质/电子** | **纸质材料份数** | **要求提供材料的依据** |
* |--- |:---: |--- |--- |--- |--- |--- |
* | 1 | 参保人银行账户信息 | 123 | 123 | 123 | 123 | 1131 |
*/
List<Map<String, Object>> sqclList = MatterDetailHtmlParseUtil.getsqclInfoMapByHtml(dom);
if (!ObjectUtils.isEmpty(sqclList)) {
Map<String, Object> map = sqclList.get(0);
Map<String, String> baseinfoHeadMap = (HashMap<String, String>) map.get("baseinfo");
sb.append("| \t");
for (Map.Entry<String, String> entry : baseinfoHeadMap.entrySet()) {
String key = entry.getKey();
sb.append(String.format("| **%s** \t", key));
sb.append("|\n");
}
sb.append("|:---:\t");
for (Map.Entry<String, String> entry : baseinfoHeadMap.entrySet()) {
sb.append("|:---:\t");
sb.append("|\n");
}
int count = 1;
for (Map<String, Object> sqclMap : sqclList) {
sb.append(String.format("| %d \t", count));
count++;
Map<String, String> baseinfoMap = (HashMap<String, String>) sqclMap.get("baseinfo");
for (Map.Entry<String, String> entry : baseinfoMap.entrySet()) {
sb.append(String.format("| %s \t", entry.getValue()));
if("要求提供材料的依据".equals(entry.getKey())) continue;
sb.append(entry.getKey()).append(" ").append(entry.getValue());
/* sb.append(entry.getKey()).append(" ").append(entry.getValue());
sb.append("\n");
*/
sb.append("|\n");
}
}
}
//更新受理条件
sb.append("\n");
sb.append("## 受理条件\n");
......@@ -1597,9 +1646,9 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
for (Map<String, Object> bllcMap : bllcMapList) {
for (Map.Entry<String, Object> entry : bllcMap.entrySet()) {
if("sort".equals(entry.getKey())){
if ("sort".equals(entry.getKey())) {
sb.append("流程").append(":").append(entry.getValue());
}else{
} else {
sb.append(entry.getKey()).append(" ").append(entry.getValue());
}
sb.append("\n");
......@@ -1635,11 +1684,11 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
sb.append("## 中介服务\n");
Map<String, String> zjfwMap = MatterDetailHtmlParseUtil.getZjfwMapByHtml(dom);
if(zjfwMap.size()>0){
if (zjfwMap.size() > 0) {
for (Map.Entry<String, String> entry : zjfwMap.entrySet()) {
sb.append(entry.getKey()).append(" ").append(entry.getValue());
}
}else{
} else {
sb.append("无\n");
}
......@@ -1655,7 +1704,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
}
}
strList.add(sb.toString());
log.info("事项名称:{}",matterEntity.getMatterName());
log.info("事项名称:{}", matterEntity.getMatterName());
break;
} catch (Exception e) {
log.error("异常", e);
......@@ -1668,7 +1717,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
}
}
String path = "E:\\gov.md";
FileUtil.writeUtf8Lines(strList,path);
FileUtil.writeUtf8Lines(strList, path);
return Rest.ok();
}
......
portal-manager/src/main/java/com/mortals/xhx/module/role/service/impl/RoleAuthServiceImpl.java
View file @ 5ec8f9f4
......@@ -3,16 +3,16 @@ package com.mortals.xhx.module.role.service.impl;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.common.key.RedisKey;
import com.mortals.xhx.module.menu.model.MenuEntity;
import com.mortals.xhx.module.menu.model.MenuQuery;
import com.mortals.xhx.module.menu.service.MenuService;
import com.mortals.xhx.module.role.dao.RoleAuthDao;
import com.mortals.xhx.module.role.model.*;
import com.mortals.xhx.module.role.model.RoleAuthEntity;
import com.mortals.xhx.module.role.model.RoleAuthQuery;
import com.mortals.xhx.module.role.model.RoleModelEntity;
import com.mortals.xhx.module.role.service.RoleAuthService;
import com.mortals.xhx.module.role.service.RoleModelService;
import com.mortals.xhx.module.role.service.RoleUserService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
......@@ -104,6 +104,9 @@ public class RoleAuthServiceImpl extends AbstractCRUDServiceImpl<RoleAuthDao, Ro
List<RoleAuthEntity> roleModelEntities = this.find(condition);
if (CollectionUtils.isNotEmpty(roleModelEntities)) {
List<Long> menuIds = roleModelEntities.stream().filter(m->m.getMenuId()!=null).map(RoleAuthEntity::getMenuId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(menuIds)){
return Collections.emptyMap();
}
MenuQuery query1 = new MenuQuery();
query1.setIdList(menuIds);
List<MenuEntity> menuEntities = menuService.find(query1);
......
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