一码通监管码不生成优化修改

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/SupervisoryCodeInfo.java

@@ -29,4 +29,8 @@ public class SupervisoryCodeInfo extends BaseEntity {
     @ApiModelProperty(value = "使用状态（0-初始，1-已使用，2-未使用）")
     @TableField("status")
     private String status;
+
+    @ApiModelProperty(value = "一码通码生成状态（0-手动生成，1-自动生成）")
+    @TableField("create_status")
+    private String createStatus;
 }

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

@@ -4,6 +4,7 @@ package com.yeejoin.amos.boot.module.tzs.api.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategoryData;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -43,4 +44,6 @@ public interface IEquipmentCategoryService {
     EquipmentCategoryData updateEquipmentCategoryData(String id);
 
     List<String> deleteBatch(Map<String, Object> map);
+
+    ResponseModel submit(Map<String, Object> map);
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/feign/IdxFeignService.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.feign;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -40,6 +39,24 @@ public interface IdxFeignService {
 
 
     /**
+     * 多表单页提交 数据填报
+     */
+    @RequestMapping(value = "/table/batch/submit", method = RequestMethod.POST)
+    ResponseModel batchSubmit(@RequestParam(required = false) String taskId,
+                                          @RequestParam(required = false) String planInstanceId,
+                                          @RequestParam(required = false) String topic,
+                                          @RequestParam(required = false) String tableName,
+                                          @RequestBody Map<String, Object> kv) throws Exception;
+
+    /**
+     * 多表单页修改数据修改
+     */
+    @RequestMapping(value = "/table/batch/update", method = RequestMethod.POST)
+    ResponseModel batchUpdate(@RequestParam(required = false) String topic,
+                              @RequestParam(required = false) String tableName,
+                              @RequestBody Map<String, Object> kv) throws Exception;
+
+    /**
      *更新任务
      */
     @RequestMapping(value = "/report/form/updateAmosTask/{taskId}", method = RequestMethod.POST)

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

@@ -241,6 +241,20 @@ public class EquipmentCategoryController extends BaseController {
 
 	}
 
+	/**
+	 * 一码通八大类设备数据操作接口
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/submit", method = RequestMethod.POST)
+	@ApiOperation(httpMethod = "POST", value = "一码通八大类设备数据操作接口", notes = "一码通八大类设备数据操作接口")
+	public ResponseModel<Object> submit(@RequestBody Map<String, Object> map) {
+		return ResponseHelper.buildResponse(equipmentCategoryService.submit(map));
+	}
+
+
+
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET)

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

@@ -27,7 +27,7 @@ public class AmosMqttListener extends EmqxListener {
         String msg = JSON.parse(str).toString();
         JSONObject jsonObject = JSONObject.parseObject(msg);
         String id = jsonObject.get("id").toString();
-        equipmentCategoryService.createSupervisorCode(null, id);
+//        equipmentCategoryService.createSupervisorCode(null, id);
         // 更新ES
         equipmentCategoryService.checkEsData(id);
         // 更新一码通总览数据统计表