安装告知修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgInstallationNoticeService.java

 package com.yeejoin.amos.boot.module.jg.api.service;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -59,7 +60,7 @@ public interface IJgInstallationNoticeService extends IService<JgInstallationNot
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
+    void saveNotice(String submitType, JSONObject model, ReginParams reginParams);
 
     /**
      * 打印告知单

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationNoticeController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -47,7 +48,7 @@ public class JgInstallationNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增安装告知", notes = "新增安装告知")
-    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
+    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody JSONObject model) {
         ReginParams reginParams = getSelectedOrgInfo();
 
         iJgInstallationNoticeService.saveNotice(submitType, model, reginParams);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/listener/PublicWorkFlowMessage.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -40,15 +41,16 @@ public class PublicWorkFlowMessage extends EmqxListener {
      */
     public static final String WORKFLOW_TASK_COMPLETED = "workflow/task/completed";
 
-//    /**
-//     * 流程执行结束主题
-//     */
-//    public static final String WORKFLOW_PROCESS_COMPLETE = "workflow/process/complete";
+    /**
+     * 流程执行结束主题
+     */
+    public static final String WORKFLOW_PROCESS_COMPLETE = "workflow/process/complete";
 
     @Autowired
     private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
 
-
+    @Autowired
+    StartPlatformTokenService platformTokenService;
 
     @PostConstruct
     void init() throws Exception {
@@ -59,9 +61,11 @@ public class PublicWorkFlowMessage extends EmqxListener {
 
     @Override
     public void processMessage(String topic, MqttMessage message) throws Exception {
-        RequestContext.setAppKey(amosAuth.getAppKey());
-        RequestContext.setProduct(amosAuth.getProduct());
-        RequestContext.setToken(amosAuth.getToken());
+//        RequestContext.setAppKey(amosAuth.getAppKey());
+//        RequestContext.setProduct(amosAuth.getProduct());
+//        RequestContext.setToken(amosAuth.getToken());
+//        RequestContext.setAgencyCode(amosAuth.getUserId());
+//        platformTokenService.getToken();
         JSONObject messageObject = JSON.parseObject(new String(message.getPayload()));
         String businessKey = messageObject.get("businessKey").toString();
         String[] s = businessKey.split("_");
@@ -76,6 +80,10 @@ public class PublicWorkFlowMessage extends EmqxListener {
             if ("installationNotice".equals(type)) {
                 jgInstallationNoticeService.completeWorkFlow(messageObject);
             }
+        } else if (topic.equals(WORKFLOW_PROCESS_COMPLETE)) {
+            if ("installationNotice".equals(type)) {
+//                jgInstallationNoticeService.completeWorkFlow(messageObject);
+            }
         }
     }