Skip to content

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

添加同步删除事项接口

parent 2654f046
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 21 deletions
base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
View file @ bebaf72f
...@@ -27,6 +27,7 @@ import com.mortals.xhx.base.system.menu.model.MenuEntity; ...@@ -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.menu.service.MenuService;
import com.mortals.xhx.base.system.resource.model.ResourceEntity; import com.mortals.xhx.base.system.resource.model.ResourceEntity;
import com.mortals.xhx.base.system.resource.service.ResourceService; 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.model.RoleUserQuery;
import com.mortals.xhx.base.system.role.service.RoleUserService; import com.mortals.xhx.base.system.role.service.RoleUserService;
import com.mortals.xhx.base.system.user.dao.UserDao; import com.mortals.xhx.base.system.user.dao.UserDao;
...@@ -273,6 +274,18 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE ...@@ -273,6 +274,18 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
return super.find(params, pageInfo, null); 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 @Override
public UserEntity createUser(IUser currUser, Long customerId, String customerName, String loginName, String password, public UserEntity createUser(IUser currUser, Long customerId, String customerName, String loginName, String password,
String userName, String mobile) throws AppException { String userName, String mobile) throws AppException {
......
base-manager/src/main/java/com/mortals/xhx/common/utils/MatterDetailHtmlParseUtil.java
View file @ bebaf72f
...@@ -464,7 +464,8 @@ public class MatterDetailHtmlParseUtil { ...@@ -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=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=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); Document dom = MatterDetailHtmlParseUtil.getDomByHtml(url);
Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom); Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ bebaf72f
...@@ -1426,7 +1426,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1426,7 +1426,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom); Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
StringBuilder sb1 = new StringBuilder(); StringBuilder sb1 = new StringBuilder();
for (Map.Entry<String, String> entry : baseInfoMap.entrySet()) { for (Map.Entry<String, String> entry : baseInfoMap.entrySet()) {
if(sb1.length()>360){ if (sb1.length() > 360) {
sb.append(sb1); sb.append(sb1);
sb.append("\n"); sb.append("\n");
sb1 = new StringBuilder(); sb1 = new StringBuilder();
...@@ -1443,7 +1443,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1443,7 +1443,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
for (Map<String, Object> sqclMap : sqclList) { for (Map<String, Object> sqclMap : sqclList) {
Map<String, String> baseinfoMap = (HashMap<String, String>) sqclMap.get("baseinfo"); Map<String, String> baseinfoMap = (HashMap<String, String>) sqclMap.get("baseinfo");
for (Map.Entry<String, String> entry : baseinfoMap.entrySet()) { for (Map.Entry<String, String> entry : baseinfoMap.entrySet()) {
if(!"材料名称".equals(entry.getKey())){ if (!"材料名称".equals(entry.getKey())) {
continue; continue;
} }
sb.append(entry.getKey()).append(" ").append(entry.getValue()); sb.append(entry.getKey()).append(" ").append(entry.getValue());
...@@ -1509,7 +1509,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1509,7 +1509,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
List<Map<String, Object>> cjwtMapList = MatterDetailHtmlParseUtil.getCjwtMapByHtml(dom); List<Map<String, Object>> cjwtMapList = MatterDetailHtmlParseUtil.getCjwtMapByHtml(dom);
for (Map<String, Object> bllcMap : cjwtMapList) { for (Map<String, Object> bllcMap : cjwtMapList) {
for (Map.Entry<String, Object> entry : bllcMap.entrySet()) { for (Map.Entry<String, Object> entry : bllcMap.entrySet()) {
if(sb3.length()>360){ if (sb3.length() > 360) {
sb.append(sb3); sb.append(sb3);
sb.append("\n"); sb.append("\n");
sb3 = new StringBuilder(); sb3 = new StringBuilder();
...@@ -1521,7 +1521,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1521,7 +1521,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
} }
sb.append(sb3); sb.append(sb3);
strList.add(sb.toString()); strList.add(sb.toString());
log.info("事项名称:{}",matterEntity.getMatterName()); log.info("事项名称:{}", matterEntity.getMatterName());
break; break;
} catch (Exception e) { } catch (Exception e) {
log.error("异常", e); log.error("异常", e);
...@@ -1537,7 +1537,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1537,7 +1537,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
//todo 实时爬取后组合 //todo 实时爬取后组合
String path = "E:\\temp.csv"; String path = "E:\\temp.csv";
FileUtil.writeUtf8Lines(strList,path); FileUtil.writeUtf8Lines(strList, path);
return Rest.ok(); return Rest.ok();
} }
...@@ -1563,27 +1563,76 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1563,27 +1563,76 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
.timeout(60 * 1000).get(); .timeout(60 * 1000).get();
//基本属性 //基本属性
sb.append("# "+matterEntity.getMatterName()+"\n"); sb.append("# " + matterEntity.getMatterName() + "\n");
sb.append("\n"); sb.append("\n");
sb.append("## 基本信息\n"); sb.append("## 基本信息\n");
Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom); Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
/**
* | **服务对象** | 自然人 |
* |---: |--- |
* | **法定时限办结说明** | 自受理之日起，在法定期限内办结 |
* | **是否收费** | 否 |
*/
boolean bool = false;
for (Map.Entry<String, String> entry : baseInfoMap.entrySet()) { 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"); sb.append("\n");
bool = false;
}
/* sb.append(entry.getKey()).append(" ").append(entry.getValue());
sb.append("\n");*/
} }
sb.append("\n"); sb.append("\n");
//更新材料属性 //更新材料属性
sb.append("## 申请材料\n"); sb.append("## 申请材料\n");
/**
* | | **材料名称** | **材料必要性** | **原件和复印件** | **纸质/电子** | **纸质材料份数** | **要求提供材料的依据** |
* |--- |:---: |--- |--- |--- |--- |--- |
* | 1 | 参保人银行账户信息 | 123 | 123 | 123 | 123 | 1131 |
*/
List<Map<String, Object>> sqclList = MatterDetailHtmlParseUtil.getsqclInfoMapByHtml(dom); 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) { for (Map<String, Object> sqclMap : sqclList) {
sb.append(String.format("| %d \t", count));
count++;
Map<String, String> baseinfoMap = (HashMap<String, String>) sqclMap.get("baseinfo"); Map<String, String> baseinfoMap = (HashMap<String, String>) sqclMap.get("baseinfo");
for (Map.Entry<String, String> entry : baseinfoMap.entrySet()) { 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"); sb.append("\n");
sb.append("## 受理条件\n"); sb.append("## 受理条件\n");
...@@ -1597,9 +1646,9 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1597,9 +1646,9 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
for (Map<String, Object> bllcMap : bllcMapList) { for (Map<String, Object> bllcMap : bllcMapList) {
for (Map.Entry<String, Object> entry : bllcMap.entrySet()) { for (Map.Entry<String, Object> entry : bllcMap.entrySet()) {
if("sort".equals(entry.getKey())){ if ("sort".equals(entry.getKey())) {
sb.append("流程").append(":").append(entry.getValue()); sb.append("流程").append(":").append(entry.getValue());
}else{ } else {
sb.append(entry.getKey()).append(" ").append(entry.getValue()); sb.append(entry.getKey()).append(" ").append(entry.getValue());
} }
sb.append("\n"); sb.append("\n");
...@@ -1635,11 +1684,11 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1635,11 +1684,11 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
sb.append("## 中介服务\n"); sb.append("## 中介服务\n");
Map<String, String> zjfwMap = MatterDetailHtmlParseUtil.getZjfwMapByHtml(dom); Map<String, String> zjfwMap = MatterDetailHtmlParseUtil.getZjfwMapByHtml(dom);
if(zjfwMap.size()>0){ if (zjfwMap.size() > 0) {
for (Map.Entry<String, String> entry : zjfwMap.entrySet()) { for (Map.Entry<String, String> entry : zjfwMap.entrySet()) {
sb.append(entry.getKey()).append(" ").append(entry.getValue()); sb.append(entry.getKey()).append(" ").append(entry.getValue());
} }
}else{ } else {
sb.append("无\n"); sb.append("无\n");
} }
...@@ -1655,7 +1704,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1655,7 +1704,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
} }
} }
strList.add(sb.toString()); strList.add(sb.toString());
log.info("事项名称:{}",matterEntity.getMatterName()); log.info("事项名称:{}", matterEntity.getMatterName());
break; break;
} catch (Exception e) { } catch (Exception e) {
log.error("异常", e); log.error("异常", e);
...@@ -1668,7 +1717,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -1668,7 +1717,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
} }
} }
String path = "E:\\gov.md"; String path = "E:\\gov.md";
FileUtil.writeUtf8Lines(strList,path); FileUtil.writeUtf8Lines(strList, path);
return Rest.ok(); return Rest.ok();
} }
......
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