Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
complex-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
complex-platform
Commits
1ff79323
Commit
1ff79323
authored
1 year ago
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加事项材料与情形查询
parent
44e1167d
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
282 additions
and
31 deletions
+282
-31
complex-window-manager/src/main/java/com/mortals/xhx/busiz/req/ComplexImplementationReq.java
...a/com/mortals/xhx/busiz/req/ComplexImplementationReq.java
+2
-0
complex-window-manager/src/main/java/com/mortals/xhx/busiz/rsp/work/ComplexWorkInfo.java
.../java/com/mortals/xhx/busiz/rsp/work/ComplexWorkInfo.java
+39
-0
complex-window-manager/src/main/java/com/mortals/xhx/busiz/web/ComplexApiController.java
.../java/com/mortals/xhx/busiz/web/ComplexApiController.java
+68
-1
complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/model/req/BaseReq.java
...ortals/xhx/protocol/complex/matter/model/req/BaseReq.java
+4
-0
complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/model/rsp/DictInfo.java
...rtals/xhx/protocol/complex/matter/model/rsp/DictInfo.java
+13
-0
complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/service/IComplexMatterService.java
...rotocol/complex/matter/service/IComplexMatterService.java
+13
-7
complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/service/impl/ComplexMatterServiceImpl.java
...complex/matter/service/impl/ComplexMatterServiceImpl.java
+26
-10
complex-window-manager/src/main/java/com/mortals/xhx/thread/DictSendTask.java
...er/src/main/java/com/mortals/xhx/thread/DictSendTask.java
+51
-0
complex-window-manager/src/main/java/com/mortals/xhx/thread/EventAndSituationSendTask.java
...ava/com/mortals/xhx/thread/EventAndSituationSendTask.java
+1
-2
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementDetailSendTask.java
.../java/com/mortals/xhx/thread/ImplementDetailSendTask.java
+1
-2
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementDynamicFormSendTask.java
.../com/mortals/xhx/thread/ImplementDynamicFormSendTask.java
+48
-0
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementListSendTask.java
...in/java/com/mortals/xhx/thread/ImplementListSendTask.java
+1
-4
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementMaterialSendTask.java
...ava/com/mortals/xhx/thread/ImplementMaterialSendTask.java
+1
-2
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementSituationSendTask.java
...va/com/mortals/xhx/thread/ImplementSituationSendTask.java
+5
-3
complex-window-manager/src/main/java/com/mortals/xhx/thread/SendThread.java
...ager/src/main/java/com/mortals/xhx/thread/SendThread.java
+9
-0
No files found.
complex-window-manager/src/main/java/com/mortals/xhx/busiz/req/ComplexImplementationReq.java
View file @
1ff79323
...
...
@@ -24,7 +24,9 @@ public class ComplexImplementationReq extends BaseApiReq {
private
List
<
String
>
itemsIds
;
private
List
<
String
>
eventIdList
;
private
String
dict
;
}
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/busiz/rsp/work/ComplexWorkInfo.java
0 → 100644
View file @
1ff79323
package
com.mortals.xhx.busiz.rsp.work
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
ComplexWorkInfo
{
private
String
fieldGenerateRules
;
private
String
commonCharacterName
;
private
Object
defaultValue
;
private
String
hcFillRule
;
private
String
defaultValueRules
;
private
Object
xpath
;
private
Object
regularName
;
private
String
handlingCharacterPackage
;
private
int
hcOrder
;
private
int
elCol
;
private
String
state
;
private
Object
commonCharacterComment
;
private
Object
parentValue
;
private
String
commonCharacterCode
;
private
String
commonCharacterId
;
private
String
commonCharacterType
;
private
int
userId
;
private
String
assType
;
private
Object
parentId
;
private
String
regularId
;
private
String
tacheStep
;
private
Object
checkTrictly
;
private
String
handlingCharacterTemplateId
;
private
Object
parentMovement
;
private
Object
regularVal
;
private
String
allowModify
;
private
String
stateDate
;
private
int
commonCharacterLength
;
private
List
<
Object
>
items
;
private
String
dataInterfaceType
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/busiz/web/ComplexApiController.java
View file @
1ff79323
...
...
@@ -18,8 +18,10 @@ import com.mortals.xhx.busiz.rsp.ImplementEventInfo;
import
com.mortals.xhx.busiz.rsp.implement.ComplexImplementDetailInfo
;
import
com.mortals.xhx.busiz.rsp.material.ComplexMaterialInfo
;
import
com.mortals.xhx.busiz.rsp.situation.ComplexStituationInfo
;
import
com.mortals.xhx.busiz.rsp.work.ComplexWorkInfo
;
import
com.mortals.xhx.common.code.ApiRespCodeEnum
;
import
com.mortals.xhx.protocol.complex.ComplexApiRest
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.DictInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.MatterListInfo
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -196,7 +198,72 @@ public class ComplexApiController {
if
(
ObjectUtil
.
isEmpty
(
rest
))
{
throw
new
AppException
(
"请求访问超时"
);
}
Rest
<
ComplexMaterialInfo
>
eventRest
=
JSON
.
parseObject
(
rest
,
new
TypeReference
<
Rest
<
ComplexMaterialInfo
>>()
{
Rest
<
List
<
ComplexMaterialInfo
>>
eventRest
=
JSON
.
parseObject
(
rest
,
new
TypeReference
<
Rest
<
List
<
ComplexMaterialInfo
>>>()
{
});
return
JSON
.
toJSONString
(
eventRest
);
}
catch
(
Exception
e
)
{
log
.
error
(
"接收数据失败"
,
e
);
rsp
.
setCode
(
ApiRespCodeEnum
.
FAILED
.
getValue
());
rsp
.
setMsg
(
e
.
getMessage
());
return
JSON
.
toJSONString
(
rsp
);
}
}
/**
* 获取办件要素
*
* @param req
* @return
*/
@PostMapping
(
"event-implementation/getDynamicFormByEventIds"
)
@UnAuth
public
String
getDynamicFormByEventIds
(
@RequestBody
ComplexImplementationReq
req
)
{
log
.
info
(
"【获取办件要素】【请求体】--> "
+
JSONObject
.
toJSONString
(
req
));
req
.
setUrlPath
(
"event-implementation/getDynamicFormByEventIds"
);
ApiResp
<
String
>
rsp
=
new
ApiResp
<>();
rsp
.
setMsg
(
ApiRespCodeEnum
.
SUCCESS
.
getLabel
());
rsp
.
setCode
(
ApiRespCodeEnum
.
SUCCESS
.
getValue
());
try
{
req
.
setNonce
(
RandomUtil
.
randomNumbers
(
6
));
cacheService
.
lpush
(
KEY_COMPLEX_REQ
,
JSONObject
.
toJSONString
(
req
));
String
rest
=
cacheService
.
blpop
(
KEY_EVENT_IMPLEMENTATION_RESP
+
req
.
getNonce
(),
HTTP_TIMEOUT
,
String
.
class
);
if
(
ObjectUtil
.
isEmpty
(
rest
))
{
throw
new
AppException
(
"请求访问超时"
);
}
Rest
<
ComplexWorkInfo
>
eventRest
=
JSON
.
parseObject
(
rest
,
new
TypeReference
<
Rest
<
ComplexWorkInfo
>>()
{
});
return
JSON
.
toJSONString
(
eventRest
);
}
catch
(
Exception
e
)
{
log
.
error
(
"接收数据失败"
,
e
);
rsp
.
setCode
(
ApiRespCodeEnum
.
FAILED
.
getValue
());
rsp
.
setMsg
(
e
.
getMessage
());
return
JSON
.
toJSONString
(
rsp
);
}
}
/**
* 查询字典值
*
* @param req
* @return
*/
@PostMapping
(
"common/queryDict"
)
@UnAuth
public
String
queryDict
(
@RequestBody
ComplexImplementationReq
req
)
{
log
.
info
(
"【查询字典值】【请求体】--> "
+
JSONObject
.
toJSONString
(
req
));
req
.
setUrlPath
(
"common/queryDict"
);
ApiResp
<
String
>
rsp
=
new
ApiResp
<>();
rsp
.
setMsg
(
ApiRespCodeEnum
.
SUCCESS
.
getLabel
());
rsp
.
setCode
(
ApiRespCodeEnum
.
SUCCESS
.
getValue
());
try
{
req
.
setNonce
(
RandomUtil
.
randomNumbers
(
6
));
cacheService
.
lpush
(
KEY_COMPLEX_REQ
,
JSONObject
.
toJSONString
(
req
));
String
rest
=
cacheService
.
blpop
(
KEY_EVENT_IMPLEMENTATION_RESP
+
req
.
getNonce
(),
HTTP_TIMEOUT
,
String
.
class
);
if
(
ObjectUtil
.
isEmpty
(
rest
))
{
throw
new
AppException
(
"请求访问超时"
);
}
Rest
<
List
<
DictInfo
>>
eventRest
=
JSON
.
parseObject
(
rest
,
new
TypeReference
<
Rest
<
List
<
DictInfo
>>>()
{
});
return
JSON
.
toJSONString
(
eventRest
);
}
catch
(
Exception
e
)
{
...
...
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/model/req/BaseReq.java
View file @
1ff79323
...
...
@@ -14,5 +14,9 @@ public class BaseReq implements Serializable {
private
String
eventIds
;
private
String
dict
;
private
List
<
String
>
itemsIds
;
private
List
<
String
>
eventIdList
;
}
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/model/rsp/DictInfo.java
0 → 100644
View file @
1ff79323
package
com.mortals.xhx.protocol.complex.matter.model.rsp
;
import
lombok.Data
;
/**
* 字典
* @author: zxfei
* @date: 2023/12/1 15:42
*/
@Data
public
class
DictInfo
{
private
String
itemText
;
private
String
itemValue
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/service/IComplexMatterService.java
View file @
1ff79323
...
...
@@ -7,6 +7,7 @@ import com.mortals.xhx.protocol.complex.matter.model.req.AcceptReq;
import
com.mortals.xhx.protocol.complex.matter.model.req.DeviceLoginReq
;
import
com.mortals.xhx.protocol.complex.matter.model.req.ImplementationReq
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.AcceptRspInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.DictInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.LoginRspInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.MatterListInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.implement.ImplementDetailInfo
;
...
...
@@ -59,7 +60,6 @@ public interface IComplexMatterService extends IComplexService {
Rest
<
MatterListInfo
>
findMatters
(
String
deviceLogo
,
ImplementationReq
implementationReq
);
/**
* 查询事项所需材料根据事项与情形id
*
...
...
@@ -70,7 +70,6 @@ public interface IComplexMatterService extends IComplexService {
Rest
<
List
<
MaterialInfo
>>
getMaterialByEventAndSituation
(
String
deviceLogo
,
ImplementationReq
implementationReq
);
/**
* 查询事项所需材料
*
...
...
@@ -81,25 +80,23 @@ public interface IComplexMatterService extends IComplexService {
Rest
<
List
<
MaterialInfo
>>
getMaterialByEvent
(
String
deviceLogo
,
String
eventId
);
/**
* 查询办理事项情形
*
* @param eventIds
* @return
*/
Rest
<
MatterWorkInfo
>
doWorkMatterSearch
(
String
deviceLogo
,
String
eventIds
);
Rest
<
List
<
MatterWorkInfo
>
>
doWorkMatterSearch
(
String
deviceLogo
,
String
eventIds
);
/**
* 获取办件要素
*
* @param deviceLogo
* @param eventId
s
* @param eventId
List
* @return
*/
Rest
<
WorkInfo
>
getWorkMatter
(
String
deviceLogo
,
String
eventIds
);
Rest
<
WorkInfo
>
getWorkMatter
(
String
deviceLogo
,
List
<
String
>
eventIdList
);
/**
...
...
@@ -112,4 +109,13 @@ public interface IComplexMatterService extends IComplexService {
Rest
<
ImplementDetailInfo
>
getImplement
(
String
deviceLogo
,
String
eventId
);
/**
* 查询字典
*
* @param deviceLogo
* @param dict
* @return
*/
Rest
<
List
<
DictInfo
>>
queryDict
(
String
deviceLogo
,
String
dict
);
}
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/service/impl/ComplexMatterServiceImpl.java
View file @
1ff79323
...
...
@@ -14,6 +14,7 @@ import com.mortals.xhx.protocol.complex.matter.model.req.AcceptReq;
import
com.mortals.xhx.protocol.complex.matter.model.req.DeviceLoginReq
;
import
com.mortals.xhx.protocol.complex.matter.model.req.ImplementationReq
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.AcceptRspInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.DictInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.LoginRspInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.MatterListInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.implement.ImplementDetailInfo
;
...
...
@@ -140,7 +141,7 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
}
@Override
public
Rest
<
MatterWorkInfo
>
doWorkMatterSearch
(
String
deviceLogo
,
String
eventIds
)
{
public
Rest
<
List
<
MatterWorkInfo
>
>
doWorkMatterSearch
(
String
deviceLogo
,
String
eventIds
)
{
String
mattersApi
=
host
+
"bus-situation-material/getSituationMaterialTreeByEventIds"
;
Map
<
String
,
String
>
paramMap
=
new
HashMap
<>();
paramMap
.
put
(
"eventIds"
,
eventIds
);
...
...
@@ -153,24 +154,20 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
ComplexApiRest
<
List
<
MatterWorkInfo
>>
complexApiRest
=
JSON
.
parseObject
(
rest
,
new
TypeReference
<
ComplexApiRest
<
List
<
MatterWorkInfo
>>>()
{
});
if
(
complexApiRest
.
getSuccess
())
{
if
(!
ObjectUtils
.
isEmpty
(
complexApiRest
.
getResult
()))
{
return
Rest
.
ok
(
complexApiRest
.
getMessage
(),
complexApiRest
.
getResult
().
get
(
0
));
}
else
{
return
Rest
.
fail
(
"查询结果数量为0"
);
}
return
Rest
.
ok
(
complexApiRest
.
getMessage
(),
complexApiRest
.
getResult
());
}
return
Rest
.
fail
(
complexApiRest
.
getMessage
());
}
@Override
public
Rest
<
WorkInfo
>
getWorkMatter
(
String
deviceLogo
,
String
eventIds
)
{
public
Rest
<
WorkInfo
>
getWorkMatter
(
String
deviceLogo
,
List
<
String
>
eventIdList
)
{
String
mattersApi
=
host
+
"event-implementation/getDynamicFormByEventIds"
;
ArrayList
<
String
>
list
=
new
ArrayList
<>();
list
.
add
(
eventIds
);
String
deviceToken
=
checkToken
(
deviceLogo
);
String
rest
=
HttpUtil
.
createPost
(
mattersApi
)
.
header
(
"X-Access-Token"
,
deviceToken
)
.
body
(
JSON
.
toJSONString
(
l
ist
))
.
body
(
JSON
.
toJSONString
(
eventIdL
ist
))
.
execute
().
body
();
ComplexApiRest
<
WorkInfo
>
complexApiRest
=
JSON
.
parseObject
(
rest
,
new
TypeReference
<
ComplexApiRest
<
WorkInfo
>>()
{
});
...
...
@@ -196,6 +193,25 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
return
Rest
.
fail
(
complexApiRest
.
getMessage
());
}
@Override
public
Rest
<
List
<
DictInfo
>>
queryDict
(
String
deviceLogo
,
String
dict
)
{
String
mattersApi
=
host
+
"common/queryDict"
;
Map
<
String
,
String
>
paramMap
=
new
HashMap
<>();
paramMap
.
put
(
"dict"
,
dict
);
String
deviceToken
=
checkToken
(
deviceLogo
);
String
rest
=
HttpUtil
.
createGet
(
mattersApi
)
.
header
(
"X-Access-Token"
,
deviceToken
)
.
formStr
(
paramMap
)
.
execute
().
body
();
log
.
info
(
"dict resp:{}"
,
rest
);
ComplexApiRest
<
List
<
DictInfo
>>
complexApiRest
=
JSON
.
parseObject
(
rest
,
new
TypeReference
<
ComplexApiRest
<
List
<
DictInfo
>>>()
{
});
if
(
complexApiRest
.
getSuccess
())
{
return
Rest
.
ok
(
complexApiRest
.
getMessage
(),
complexApiRest
.
getResult
());
}
return
Rest
.
fail
(
complexApiRest
.
getMessage
());
}
@Override
public
Rest
<
List
<
MaterialInfo
>>
getMaterialByEventAndSituation
(
String
deviceLogo
,
ImplementationReq
implementationReq
)
{
...
...
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/thread/DictSendTask.java
0 → 100644
View file @
1ff79323
package
com.mortals.xhx.thread
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.service.ICacheService
;
import
com.mortals.xhx.protocol.complex.matter.model.req.ImplementationReq
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.DictInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.material.MaterialInfo
;
import
com.mortals.xhx.protocol.complex.matter.service.IComplexMatterService
;
import
com.mortals.xhx.utils.SpringUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
java.util.List
;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
Constant
.
REDIS_RESP_TIMEOUT
;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
RedisKey
.
KEY_EVENT_IMPLEMENTATION_RESP
;
@Slf4j
public
class
DictSendTask
implements
Runnable
{
private
ImplementationReq
implementationReq
;
private
String
deviceLogo
;
private
IComplexMatterService
complexMatterService
;
private
ICacheService
cacheService
;
public
DictSendTask
(
String
deviceLogo
,
ImplementationReq
implementationReq
)
{
this
.
implementationReq
=
implementationReq
;
this
.
deviceLogo
=
deviceLogo
;
complexMatterService
=
SpringUtils
.
getBean
(
IComplexMatterService
.
class
);
cacheService
=
SpringUtils
.
getBean
(
ICacheService
.
class
);
}
@Override
public
void
run
()
{
try
{
log
.
info
(
"DictSendTask启动发送"
);
Rest
<
List
<
DictInfo
>>
rest
=
complexMatterService
.
queryDict
(
deviceLogo
,
implementationReq
.
getDict
());
cacheService
.
lpushForTime
(
KEY_EVENT_IMPLEMENTATION_RESP
+
implementationReq
.
getNonce
(),
REDIS_RESP_TIMEOUT
,
JSONObject
.
toJSONString
(
rest
));
}
catch
(
Exception
e
)
{
log
.
error
(
"发送异常:"
+
e
);
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/thread/EventAndSituationSendTask.java
View file @
1ff79323
...
...
@@ -37,9 +37,8 @@ public class EventAndSituationSendTask implements Runnable {
@Override
public
void
run
()
{
try
{
log
.
info
(
"启动发送"
);
log
.
info
(
"
EventAndSituationSendTask
启动发送"
);
Rest
<
List
<
MaterialInfo
>>
rest
=
complexMatterService
.
getMaterialByEventAndSituation
(
deviceLogo
,
implementationReq
);
log
.
info
(
"发送完成==>{}"
,
JSONObject
.
toJSONString
(
rest
));
cacheService
.
lpushForTime
(
KEY_EVENT_IMPLEMENTATION_RESP
+
implementationReq
.
getNonce
(),
REDIS_RESP_TIMEOUT
,
JSONObject
.
toJSONString
(
rest
));
}
catch
(
Exception
e
)
{
...
...
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementDetailSendTask.java
View file @
1ff79323
...
...
@@ -35,9 +35,8 @@ public class ImplementDetailSendTask implements Runnable {
@Override
public
void
run
()
{
try
{
log
.
info
(
"启动发送"
);
log
.
info
(
"
ImplementDetailSendTask
启动发送"
);
Rest
<
ImplementDetailInfo
>
rest
=
complexMatterService
.
getImplement
(
deviceLogo
,
implementationReq
.
getEventId
());
log
.
info
(
"发送完成==>{}"
,
JSONObject
.
toJSONString
(
rest
));
cacheService
.
lpushForTime
(
KEY_EVENT_IMPLEMENTATION_RESP
+
implementationReq
.
getNonce
(),
REDIS_RESP_TIMEOUT
,
JSONObject
.
toJSONString
(
rest
));
}
catch
(
Exception
e
)
{
...
...
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementDynamicFormSendTask.java
0 → 100644
View file @
1ff79323
package
com.mortals.xhx.thread
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.service.ICacheService
;
import
com.mortals.xhx.protocol.complex.matter.model.req.ImplementationReq
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.implement.ImplementDetailInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.work.WorkInfo
;
import
com.mortals.xhx.protocol.complex.matter.service.IComplexMatterService
;
import
com.mortals.xhx.utils.SpringUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
Constant
.
REDIS_RESP_TIMEOUT
;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
RedisKey
.
KEY_EVENT_IMPLEMENTATION_RESP
;
@Slf4j
public
class
ImplementDynamicFormSendTask
implements
Runnable
{
private
ImplementationReq
implementationReq
;
private
String
deviceLogo
;
private
IComplexMatterService
complexMatterService
;
private
ICacheService
cacheService
;
public
ImplementDynamicFormSendTask
(
String
deviceLogo
,
ImplementationReq
implementationReq
)
{
this
.
implementationReq
=
implementationReq
;
this
.
deviceLogo
=
deviceLogo
;
complexMatterService
=
SpringUtils
.
getBean
(
IComplexMatterService
.
class
);
cacheService
=
SpringUtils
.
getBean
(
ICacheService
.
class
);
}
@Override
public
void
run
()
{
try
{
log
.
info
(
"ImplementDynamicFormSendTask启动发送"
);
Rest
<
WorkInfo
>
rest
=
complexMatterService
.
getWorkMatter
(
deviceLogo
,
implementationReq
.
getEventIdList
());
cacheService
.
lpushForTime
(
KEY_EVENT_IMPLEMENTATION_RESP
+
implementationReq
.
getNonce
(),
REDIS_RESP_TIMEOUT
,
JSONObject
.
toJSONString
(
rest
));
}
catch
(
Exception
e
)
{
log
.
error
(
"发送异常:"
+
e
);
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementListSendTask.java
View file @
1ff79323
...
...
@@ -34,11 +34,8 @@ public class ImplementListSendTask implements Runnable {
@Override
public
void
run
()
{
try
{
log
.
info
(
"启动发送"
);
log
.
info
(
"
ImplementListSendTask
启动发送"
);
Rest
<
MatterListInfo
>
rest
=
complexMatterService
.
findMatters
(
deviceLogo
,
implementationReq
);
log
.
info
(
"发送完成==>{}"
,
JSONObject
.
toJSONString
(
rest
));
cacheService
.
lpushForTime
(
KEY_EVENT_IMPLEMENTATION_RESP
+
implementationReq
.
getNonce
(),
REDIS_RESP_TIMEOUT
,
JSONObject
.
toJSONString
(
rest
));
}
catch
(
Exception
e
)
{
...
...
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementMaterialSendTask.java
View file @
1ff79323
...
...
@@ -37,9 +37,8 @@ public class ImplementMaterialSendTask implements Runnable {
@Override
public
void
run
()
{
try
{
log
.
info
(
"启动发送"
);
log
.
info
(
"
ImplementMaterialSendTask
启动发送"
);
Rest
<
List
<
MaterialInfo
>>
rest
=
complexMatterService
.
getMaterialByEvent
(
deviceLogo
,
implementationReq
.
getEventId
());
log
.
info
(
"发送完成==>{}"
,
JSONObject
.
toJSONString
(
rest
));
cacheService
.
lpushForTime
(
KEY_EVENT_IMPLEMENTATION_RESP
+
implementationReq
.
getNonce
(),
REDIS_RESP_TIMEOUT
,
JSONObject
.
toJSONString
(
rest
));
}
catch
(
Exception
e
)
{
...
...
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/thread/ImplementSituationSendTask.java
View file @
1ff79323
...
...
@@ -5,11 +5,14 @@ import com.mortals.framework.common.Rest;
import
com.mortals.framework.service.ICacheService
;
import
com.mortals.xhx.protocol.complex.matter.model.req.ImplementationReq
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.implement.ImplementDetailInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.material.MaterialInfo
;
import
com.mortals.xhx.protocol.complex.matter.model.rsp.matter.MatterWorkInfo
;
import
com.mortals.xhx.protocol.complex.matter.service.IComplexMatterService
;
import
com.mortals.xhx.utils.SpringUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
java.util.List
;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
Constant
.
REDIS_RESP_TIMEOUT
;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
RedisKey
.
KEY_EVENT_IMPLEMENTATION_RESP
;
...
...
@@ -35,9 +38,8 @@ public class ImplementSituationSendTask implements Runnable {
@Override
public
void
run
()
{
try
{
log
.
info
(
"启动发送"
);
Rest
<
MatterWorkInfo
>
rest
=
complexMatterService
.
doWorkMatterSearch
(
deviceLogo
,
implementationReq
.
getEventId
());
log
.
info
(
"发送完成==>{}"
,
JSONObject
.
toJSONString
(
rest
));
log
.
info
(
"ImplementSituationSendTask启动发送"
);
Rest
<
List
<
MaterialInfo
>>
rest
=
complexMatterService
.
getMaterialByEventAndSituation
(
deviceLogo
,
implementationReq
);
cacheService
.
lpushForTime
(
KEY_EVENT_IMPLEMENTATION_RESP
+
implementationReq
.
getNonce
(),
REDIS_RESP_TIMEOUT
,
JSONObject
.
toJSONString
(
rest
));
}
catch
(
Exception
e
)
{
...
...
This diff is collapsed.
Click to expand it.
complex-window-manager/src/main/java/com/mortals/xhx/thread/SendThread.java
View file @
1ff79323
...
...
@@ -71,8 +71,17 @@ public class SendThread extends AbstractThread {
ImplementationReq
implementationReq
=
JSONObject
.
parseObject
(
reqStr
,
ImplementationReq
.
class
);
ImplementMaterialSendTask
implementSendTask
=
new
ImplementMaterialSendTask
(
deviceCode
,
implementationReq
);
ThreadPool
.
getInstance
().
execute
(
implementSendTask
);
}
else
if
(
"event-implementation/getDynamicFormByEventIds"
.
equals
(
urlPath
)){
ImplementationReq
implementationReq
=
JSONObject
.
parseObject
(
reqStr
,
ImplementationReq
.
class
);
ImplementDynamicFormSendTask
implementSendTask
=
new
ImplementDynamicFormSendTask
(
deviceCode
,
implementationReq
);
ThreadPool
.
getInstance
().
execute
(
implementSendTask
);
}
else
if
(
"common/queryDict"
.
equals
(
urlPath
)){
ImplementationReq
implementationReq
=
JSONObject
.
parseObject
(
reqStr
,
ImplementationReq
.
class
);
DictSendTask
implementSendTask
=
new
DictSendTask
(
deviceCode
,
implementationReq
);
ThreadPool
.
getInstance
().
execute
(
implementSendTask
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment