Skip to content

B
base-platform
Commit 89eb6a6a authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加批量新增窗口业务接口

parent bf460185
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 319 deletions
base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java
View file @ 89eb6a6a
......@@ -3,6 +3,7 @@ package com.mortals.xhx.common.utils;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.site.service.SiteService;
import lombok.AllArgsConstructor;
import lombok.extern.apachecommons.CommonsLog;
/**
* @author: zxfei
......@@ -10,6 +11,7 @@ import lombok.AllArgsConstructor;
* @description:
**/
@AllArgsConstructor
@CommonsLog
public class SyncTreeSiteThread implements Runnable {
private SiteService siteService;
......@@ -18,6 +20,7 @@ public class SyncTreeSiteThread implements Runnable {
@Override
public void run() {
log.info("刷新站点树");
siteService.setSiteTree(siteService.siteTree(context), context);
}
......
base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessController.java
View file @ 89eb6a6a
......@@ -66,7 +66,7 @@ public class BusinessController extends BasePhpCRUDJsonMappingController<Busines
@PostMapping(value = "addBusinessToSite")
public String addBusinessToSite(@RequestBody Map<String, Object> map) {
JSONObject jsonObject = new JSONObject();
Map<String, Object> model = new HashMap<String, Object>();
Map<String, Object> model = new HashMap<>();
String businessIds=(String)map.get("businessIds");
Long siteId= DataUtil.converObj2Long(map.get("siteId"));
try {
......
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @ 89eb6a6a
......@@ -153,6 +153,13 @@ public class SiteServiceImpl extends AbstractCRUDServiceImpl<SiteDao, SiteEntity
}
@Override
protected void updateAfter(SiteEntity entity, Context context) throws AppException {
//刷新站点树
new Thread(new SyncTreeSiteThread(this,context)).start();
super.updateAfter(entity, context);
}
@Override
protected void saveAfter(SiteEntity entity, Context context) throws AppException {
//刷新站点树
......
base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowController.java
View file @ 89eb6a6a
......@@ -49,7 +49,7 @@ public class WindowController extends BasePhpCRUDJsonMappingController<WindowSer
@PostMapping(value = "addBusinessToWindow")
public String addBusinessToSite(@RequestBody Map<String, Object> map) {
JSONObject jsonObject = new JSONObject();
Map<String, Object> model = new HashMap<String, Object>();
Map<String, Object> model = new HashMap<>();
String businessIds=(String)map.get("businessIds");
Long windowId= DataUtil.converObj2Long(map.get("windowId"));
try {
......
doc/api-two.md
View file @ 89eb6a6a
......@@ -1954,6 +1954,45 @@ dict|object|字典对象|-
}
```
### 添加业务到站点
**请求URL:** business/addBusinessToSite
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 添加业务到站点
**请求参数:**
参数名称|类型|备注|必填|其它
---|---|---|---|---
businessIds|String|业务id,多个逗号分隔|否|-
siteId|String|站点ID|否|-
**请求样例:**
```
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|-
msg|String|消息|-
data|object|数据对象|-
**响应消息样例:**
```
```
### 编辑站点业务
**请求URL:** business/edit
......@@ -2011,54 +2050,6 @@ dict|object|字典对象|-
**响应消息样例:**
```
{
"code": 1,
"data": {
"businessType": 1,
"canorder": 1,
"cantake": 1,
"children": [],
"createTime": 1643004759000,
"createUserId": 1,
"datashow": 1,
"englishname": "foe6s9",
"flownum": "k39shb",
"id": 8,
"isBusiness": 0,
"name": "测试业务",
"parentId": 0,
"remark": "fvnn84",
"status": 1,
"updateTime": 1643004759000
},
"dict": {
"cantake": {
"0": "不允许",
"1": "允许"
},
"isBusiness": {
"0": "一级业务",
"1": "二级业务"
},
"datashow": {
"0": "不展示",
"1": "展示"
},
"canorder": {
"0": "不允许",
"1": "允许"
},
"businessType": {
"0": "一体化业务",
"1": "自建业务"
},
"status": {
"0": "停用",
"1": "正常"
}
}
}
```
### 查看站点业务
......@@ -2117,27 +2108,7 @@ dict|object|字典对象|-
**响应消息样例:**
```
{
"code": 1,
"data": {
"businessType": 1,
"canorder": 1,
"cantake": 1,
"children": [],
"createTime": 1643004759000,
"createUserId": 1,
"datashow": 1,
"englishname": "foe6s9",
"flownum": "k39shb",
"id": 8,
"isBusiness": 0,
"name": "测试业务",
"parentId": 0,
"remark": "fvnn84",
"status": 1,
"updateTime": 1643004759000
}
}
```
### 保存更新站点业务
......@@ -2275,57 +2246,6 @@ msg|String|消息|-
```
### 添加业务到站点
**请求URL:** business/addBusinessToSite
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 添加业务id到分站点上
**请求参数:**
参数名称|类型|备注|必填|其它
---|---|---|---|---
siteId|Long|站点ID|是|-
businessIds|String|业务id|是|多个逗号分隔
**请求样例:**
```
{
"siteId":520,
"businessIds":"1,2",
}
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|-
msg|String|消息|-
**响应消息样例:**
```
{
"msg":"新增模块成功",
"code":1,
"data":{
}
}
```
## 基础事项
### 查询基础事项列表
......@@ -6827,36 +6747,6 @@ dict|object|字典对象|-
**响应消息样例:**
```
{
"code": 1,
"data": {
"building": 1,
"createTime": 1643007227000,
"createUserId": 1,
"deptId": 1,
"deptName": "测试站点部门",
"englishName": "n1mu84",
"englishRegion": "au277n",
"fromnum": "z7etfk",
"hongqi": 1,
"id": 1,
"level": 2,
"name": "测试窗口1",
"region": "v3gh02",
"siteId": 1,
"siteName": "测试站点",
"summary": "o0d5l4",
"updateTime": 1643007227000
},
"dict": {
"level": {},
"building": {},
"hongqi": {
"0": "否",
"1": "是"
}
}
}
```
......@@ -6912,28 +6802,6 @@ dict|object|字典对象|-
**响应消息样例:**
```
{
"code": 1,
"data": {
"building": 1,
"createTime": 1643007227000,
"createUserId": 1,
"deptId": 1,
"deptName": "测试站点部门",
"englishName": "n1mu84",
"englishRegion": "au277n",
"fromnum": "z7etfk",
"hongqi": 1,
"id": 1,
"level": 2,
"name": "测试窗口1",
"region": "v3gh02",
"siteId": 1,
"siteName": "测试站点",
"summary": "o0d5l4",
"updateTime": 1643007227000
}
}
```
......@@ -6969,22 +6837,6 @@ level|Integer|楼层|是|-
**请求样例:**
```
{
"siteId":1,
"siteName":"测试站点",
"deptId":1,
"deptName":"测试站点部门",
"name":"测试窗口1",
"englishName":"n1mu84",
"region":"v3gh02",
"englishRegion":"au277n",
"fromnum":"z7etfk",
"hongqi":1,
"summary":"o0d5l4",
"building":1,
"level":2
}
```
**响应参数:**
......@@ -7016,22 +6868,6 @@ data|object|数据对象|-
**响应消息样例:**
```
{
"msg":"新增模块成功",
"code":1,
"data":{
"__mortals_form_state__":"ADD",
"id":4,
"entity":{
"createTime":1642486776780,
"id":4,
"modelCode":"phxt1",
"modelName":"排号系统4",
"updateTime":1642486776780
}
}
}
```
......@@ -7076,6 +6912,77 @@ msg|String|消息|-
```
### 添加业务到窗口
**请求URL:** window/addBusinessToWindow
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 添加业务到窗口
**请求参数:**
参数名称|类型|备注|必填|其它
---|---|---|---|---
businessIds|String|业务ids|是|逗号分隔
windowId|Long|窗口ID|是|窗口id
**请求样例:**
```
{
}
```
**Response-example:**
```
...
```
### 添加业务到窗口
**请求URL:** window/addBusinessToWindow
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 添加业务到窗口
**请求参数:**
参数名称|类型|备注|必填|其它
---|---|---|---|---
businessIds|String|业务ids|是|逗号分隔
windowId|Long|窗口ID|是|窗口id
**请求样例:**
```
{
}
```
**Response-example:**
```
...
```
### 导出站点部门窗口
**请求URL:** window/exportExcel
......@@ -7110,9 +7017,6 @@ idList|Arrays|id数组|否|需要导出的多项
```
## 工作人员
### 查询工作人员列表
......@@ -7139,6 +7043,7 @@ siteId|Long|站点ID|否|-
siteName|String|站点名称|否|-
name|String|姓名|否|-
number|String|工号|否|-
modelIds|String|模块id,逗号分隔|否|-
**请求样例:**
```
......@@ -7185,6 +7090,7 @@ data|object|数据对象|-
&emsp;&emsp;dangyuan|Integer|党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)|-
&emsp;&emsp;phone|String|电话|-
&emsp;&emsp;mobile|String|手机|-
&emsp;&emsp;modelIds|String|模块id,逗号分隔|-
&emsp;&emsp;starlevel|Integer|星级|-
&emsp;&emsp;summary|String|个人简介|-
&emsp;&emsp;photoPath|String|照片|-
......@@ -7280,38 +7186,6 @@ dict|object|字典对象|-
**响应消息样例:**
```
{
"code": 1,
"data": {
"id":6437,
"systemUserId":9931,
"deptId":7045,
"deptName":"djp3se",
"windowId":1546,
"windowName":"gfsja0",
"siteId":5506,
"siteName":"413dp3",
"name":"uirg7w",
"number":"ojy1dh",
"userpost":"s7c7md",
"posttitle":"vs30nh",
"politicalstatus":8139,
"dangyuan":9909,
"phone":"m4krqv",
"mobile":"hdgb0u",
"starlevel":6072,
"summary":"8kr8m8",
"photoPath":"tcpx3u",
"duty":"wkvf92",
"promise":"nlpjsc",
"business":"hzlj1f",
"online":1635,
"createTime":"2022-01-20",
"createUserId":248,
"updateTime":"2022-01-20"
}
}
```
### 查看工作人员
......@@ -7365,6 +7239,7 @@ data|object|数据对象|-
&emsp;duty|String|岗位职责|-
&emsp;promise|String|服务承诺|-
&emsp;business|String|办理事项|-
&emsp;modelIds|String|模块id,逗号分隔|-
&emsp;online|Integer|是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）|-
&emsp;createTime|Date|创建时间|-
&emsp;createUserId|Long|创建用户|-
......@@ -7375,37 +7250,7 @@ dict|object|字典对象|-
**响应消息样例:**
```
{
"code": 1,
"data": {
"id":1531,
"systemUserId":7326,
"deptId":509,
"deptName":"6xmgb7",
"windowId":5461,
"windowName":"pfjxkr",
"siteId":3721,
"siteName":"8sh9as",
"name":"1ztl2b",
"number":"gi6gfi",
"userpost":"8tyyt3",
"posttitle":"d2xnj5",
"politicalstatus":6183,
"dangyuan":1178,
"phone":"t9ppxd",
"mobile":"e7lwsv",
"starlevel":685,
"summary":"s9yt7b",
"photoPath":"3bidqu",
"duty":"sjdrcf",
"promise":"0f4zz5",
"business":"f5es91",
"online":2501,
"createTime":"2022-01-20",
"createUserId":4022,
"updateTime":"2022-01-20"
}
}
```
### 保存更新工作人员
......@@ -7446,37 +7291,12 @@ photoPath|String|照片|是|-
duty|String|岗位职责|是|-
promise|String|服务承诺|是|-
business|String|办理事项|是|-
modelIds|String|模块ids|是|-
online|Integer|是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）|是|-
**请求样例:**
```
{
"userName":"workman",
"password": "123456",
"deptId":1,
"deptName":"测试站点部门",
"windowId":1,
"windowName":"测试窗口1",
"siteId":1,
"siteName":"测试站点",
"name":"w8oamz",
"number":"8ylq9h",
"userpost":"4nl4dx",
"posttitle":"8qv5uh",
"politicalstatus":1,
"dangyuan":1,
"phone":"sotmv2",
"mobile":"4oj2d8",
"starlevel":1,
"summary":"ypajwa",
"photoPath":"/xxxx/xx.jepg",
"duty":"aahncs",
"promise":"av4y8s",
"business":"eir0kk",
"online":1
}
```
**响应参数:**
......@@ -7517,21 +7337,6 @@ data|object|数据对象|-
**响应消息样例:**
```
{
"msg":"新增模块成功",
"code":1,
"data":{
"__mortals_form_state__":"ADD",
"id":4,
"entity":{
"createTime":1642486776780,
"id":4,
"modelCode":"phxt1",
"modelName":"排号系统4",
"updateTime":1642486776780
}
}
}
```
......@@ -7569,12 +7374,6 @@ msg|String|消息|-
**响应消息样例:**
```
{
"code":1,
"msg":"成功"
}
```
### 导入工作人员模板下载
......
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