Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
ee70b7c383

+ 3 - 3
src/main/java/com/persagy/proxy/adm/controller/AdmReportEquipController.java

@@ -455,12 +455,12 @@ public class AdmReportEquipController {
             ArrayNode arrayNode = criteria.putObject("id").putArray("$in");
             equipUpDateEnclosureMap.keySet().stream().forEach(equipId -> arrayNode.add(equipId));
             queryCriteria.setCriteria(criteria);
-            AdmResponse euips = equipmentService.doQuery(context, queryCriteria, AdmEquipment.class);
-            if(CollUtil.isEmpty(euips.getContent())){
+            AdmResponse equips = equipmentService.doQuery(context, queryCriteria, AdmEquipment.class);
+            if(CollUtil.isEmpty(equips.getContent())){
                 return AdmResponse.failure(ResponseCode.A0400.getDesc());
             }
             //将需要更新的数据放到待更新的设备中
-            List<AdmEquipment> equipmentList = JSONUtil.toList(euips.getContent().toString(), AdmEquipment.class);
+            List<AdmEquipment> equipmentList = JSONUtil.toList(equips.getContent().toString(), AdmEquipment.class);
             //获取所有属性
             Map<String, Field> fieldMap = ReflectUtil.getFieldMap(EquipUpDateEnclosure.class);
             //对每个设备更新属性

+ 1 - 1
src/main/java/com/persagy/proxy/adm/controller/RelationSpInBdOrFlController.java

@@ -101,7 +101,7 @@ public class RelationSpInBdOrFlController {
      * @param    requestParam    对象
      * @return                       删除的结果信息
      */
-    @PostMapping("/bd-del")
+    @PostMapping("/bd-del-1")
     public AdmResponse delete(@RequestParam String projectId,
                               @RequestBody JSONObject requestParam) throws Exception {
         JSONArray content = requestParam.getJSONArray("content");