diff --git a/src/main/java/com/lilosoft/api/controller/MqConsumer.java b/src/main/java/com/lilosoft/api/controller/MqConsumer.java
index cebb542fe81a49b373e557a9e4ebca81edc76da4..cee3045c83e31e8fd413324df44a4909fae6f962 100644
--- a/src/main/java/com/lilosoft/api/controller/MqConsumer.java
+++ b/src/main/java/com/lilosoft/api/controller/MqConsumer.java
@@ -22,9 +22,6 @@ import java.util.HashMap;
@Slf4j
public class MqConsumer {
-
- @Autowired
- private ApplyService applyService;
@Autowired
private ComplexService complexService;
@@ -36,7 +33,6 @@ public class MqConsumer {
@JmsListener(destination = "${api.mq}", containerFactory = "jmsListenerContainerQueue")
public void receiveMsg(HashMap<String, String> text) {
- // log.info("receive msg==>{}", JSONUtil.toJsonStr(text));
RobotCaseRecord caseRecord = new RobotCaseRecord();
caseRecord.setId(IdUtil.simpleUUID());
caseRecord.setContent(text.get("content"));
@@ -45,20 +41,9 @@ public class MqConsumer {
caseRecord.setUpdateTime(new Date());
try {
robotApi.saveRecord(caseRecord);
-
String content = text.get("content");
ReceiveMsgInfo receiveMsgInfo = JSON.parseObject(content, ReceiveMsgInfo.class);
-
- // HashMap<String, Object> entries = JSONUtil.toBean(text.get("content"), HashMap.class);
- // String apply = applyService.webApply(entries);
- String apply = complexService.windowApply(receiveMsgInfo);
-/* if (ObjectUtils.isEmpty(apply)) {
- caseRecord.setSendFlag("2");
- caseRecord.setMsg("success");
- } else {
- caseRecord.setSendFlag("1");
- caseRecord.setMsg(apply);
- }*/
+ complexService.windowApply(receiveMsgInfo);
robotApi.saveRecord(caseRecord);
} catch (Exception e) {
caseRecord.setSendFlag("1");
@@ -66,8 +51,5 @@ public class MqConsumer {
robotApi.saveRecord(caseRecord);
log.error(e.getMessage());
}
-
-
}
-
}
diff --git a/src/main/java/com/lilosoft/api/service/ComplexService.java b/src/main/java/com/lilosoft/api/service/ComplexService.java
index f958e7e95436c12405bc572a75fc6bd3eff1aa05..20694c21f8cb4a4d6b40f7401a059d7245ff1ba6 100644
--- a/src/main/java/com/lilosoft/api/service/ComplexService.java
+++ b/src/main/java/com/lilosoft/api/service/ComplexService.java
@@ -34,7 +34,6 @@ import java.util.Map;
@Slf4j
public class ComplexService extends PublicService {
-
@Autowired
private OcrApi ocrApi;
@@ -51,21 +50,17 @@ public class ComplexService extends PublicService {
* 缁肩獥鐢虫姤
*/
public String windowApply(ReceiveMsgInfo receiveMsgInfo) throws Exception {
-
logger.info(JSONUtil.toJsonStr(receiveMsgInfo));
Boolean success = receiveMsgInfo.getSuccess();
if (success) {
-
ComplexWindowAbstract complexWindowAbstract = ComplexWindowAbstract.newType(receiveMsgInfo.getItemCode());
CommonData commonData = new CommonData();
commonData.setRobertServerUrl(robertServerUrl);
commonData.setComplexServerUrl(complexServerUrl);
commonData.setDeviceLogo(deviceCode);
commonData.setFileData(receiveMsgInfo.getFileData());
-
//璁剧疆鐢宠浜轰俊鎭�
Map<String, String> userData = receiveMsgInfo.getUserData();
-
//鐢宠浜轰俊鎭�
commonData.setApplicantName(userData.getOrDefault("applicantName",""));
//鐢宠浜烘€у埆
@@ -76,20 +71,15 @@ public class ComplexService extends PublicService {
commonData.setApplicantPhone(userData.getOrDefault("applicantPhone",""));
//鐢宠浜鸿瘉浠�
commonData.setApplicantDocumentId("111");
-
//璁剧疆娉曚汉淇℃伅
commonData.setLegalName(userData.getOrDefault("legalName",""));//钀ヤ笟鎵х収娉曚汉濮撳悕
commonData.setLegalIdNumber(userData.getOrDefault("legalIdNumber",""));//娉曚汉id鍙�
commonData.setLegalSex(userData.getOrDefault("legalSex",""));//娉曚汉鎬у埆
commonData.setLegalDocumentId("111");
-
- //commonData.setUserMap();
complexWindowAbstract.doHandleWork(commonData);
-
} else {
log.info("棰勫浜嬮」鏈€氳繃");
}
-
String result = "";//杩斿洖缁撴灉
boolean check = true;//浜嬮」鏄惁鏌ユ壘鍒帮紝榛樿浜嬮」宸茬粡鏌ユ壘鍒�
return result;
diff --git a/src/main/java/com/lilosoft/complex/AbstractComplexService.java b/src/main/java/com/lilosoft/complex/AbstractComplexService.java
index e368189012d6c7126e75af4a4e4c2aa57611beb5..2e74d261aba204af78bb6e92de9f698d9ebfce75 100644
--- a/src/main/java/com/lilosoft/complex/AbstractComplexService.java
+++ b/src/main/java/com/lilosoft/complex/AbstractComplexService.java
@@ -26,10 +26,6 @@ public abstract class AbstractComplexService implements IComplexMatterService {
//缁肩獥鎺ヤ欢token deviceCode--瀵瑰簲tokenMap
public static Map<String, String> tokenMap=new HashMap<>();
- //缁肩獥鎺ヤ欢token
- public String token;
-
-
@Override
public String getToken(String deviceLogo) {
try {
diff --git a/src/main/java/com/lilosoft/complex/matter/service/impl/ComplexMatterServiceImpl.java b/src/main/java/com/lilosoft/complex/matter/service/impl/ComplexMatterServiceImpl.java
index ac7c3b180890b831e33fc5ed276f760b92beabe2..bc834cf3c63ed93411f43c875f3cdf281e686f2f 100644
--- a/src/main/java/com/lilosoft/complex/matter/service/impl/ComplexMatterServiceImpl.java
+++ b/src/main/java/com/lilosoft/complex/matter/service/impl/ComplexMatterServiceImpl.java
@@ -60,9 +60,7 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
String uploadApi = host + "common/uploadFileToFtp?conversionImage=Y";
HttpRequest request = HttpRequest.post(uploadApi);
-
String deviceToken = checkToken(deviceLogo);
-
request.form("file", bytes, fileName);
String uploadRest = request.header("X-Access-Token", deviceToken).execute().body();
ComplexApiRest<String> complexApiRest = JSON.parseObject(uploadRest, new TypeReference<ComplexApiRest<String>>() {
@@ -76,15 +74,12 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
@Override
public Rest<List<AcceptRspInfo>> accept(String deviceLogo, AcceptReq acceptReq) {
String deviceLoginApi = host + "self-device-info/acceptHandling";
-
log.info("accept req==>{}",JSON.toJSONString(acceptReq));
-
String deviceToken = checkToken(deviceLogo);
String rest = HttpUtil.createPost(deviceLoginApi)
.header("X-Access-Token", deviceToken)
.body(JSON.toJSONString(acceptReq))
.execute().body();
-
log.info("accept resp==>{}",rest);
ComplexApiRest<List<AcceptRspInfo>> complexApiRest = JSON.parseObject(rest, new TypeReference<ComplexApiRest<List<AcceptRspInfo>>>() {
});
@@ -98,7 +93,6 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
@Override
public Rest<MatterListInfo> findMatters(String deviceLogo, ImplementationReq implementationReq) {
String mattersApi = host + "event-implementation/list";
-
Map<String, String> paramMap = new HashMap<>();
// 灏哅ap涓殑灞炴€у€艰浆涓哄瓧绗︿覆
for (Map.Entry<String, Object> entry : BeanUtil.beanToMap(implementationReq, false, true).entrySet()) {
@@ -107,14 +101,11 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
String stringValue = String.valueOf(value);
paramMap.put(key, stringValue);
}
-
String deviceToken = checkToken(deviceLogo);
-
String rest = HttpUtil.createGet(mattersApi)
.header("X-Access-Token", deviceToken)
.formStr(paramMap)
.execute().body();
-
ComplexApiRest<MatterListInfo> complexApiRest = JSON.parseObject(rest, new TypeReference<ComplexApiRest<MatterListInfo>>() {
});
if (complexApiRest.getCode() == 200) {
@@ -126,10 +117,8 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
@Override
public Rest<MatterWorkInfo> doWorkMatterSearch(String deviceLogo, String eventIds) {
String mattersApi = host + "bus-situation-material/getSituationMaterialTreeByEventIds";
-
Map<String, String> paramMap = new HashMap<>();
paramMap.put("eventIds", eventIds);
-
String deviceToken = checkToken(deviceLogo);
String rest = HttpUtil.createGet(mattersApi)
.header("X-Access-Token", deviceToken)
@@ -151,17 +140,13 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
@Override
public Rest<WorkInfo> getWorkMatter(String deviceLogo, String eventIds) {
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(list))
.execute().body();
-
ComplexApiRest<WorkInfo> complexApiRest = JSON.parseObject(rest, new TypeReference<ComplexApiRest<WorkInfo>>() {
});
if (complexApiRest.getCode() == 200) {