修改数据查询，增加字典维护

alarm-web/src/main/java/com/gyee/alarm/controller/ProBasicDataDictionaryController.java

@@ -23,6 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/datadictionary")
+@CrossOrigin
 @Api(value = "字典接口", tags = "字典接口")
 public class ProBasicDataDictionaryController {
         /*

alarm-web/src/main/java/com/gyee/alarm/init/Cache/PointUnitCache.java

@@ -41,7 +41,7 @@ public class PointUnitCache {
                 for (List<String> codeList:
                         partition) {
                     QueryWrapper wrapper = new QueryWrapper<ProBasicDeviceMetrics>();
-                    wrapper.in("METRICCODE", codeList);
+                    wrapper.in("metric_code", codeList);
                     list.addAll(proBasicDeviceMetricsMapper.selectList(wrapper))  ;
 
                 }

alarm-web/src/main/java/com/gyee/alarm/model/auto/ProBasicDataDictionary.java

@@ -23,7 +23,7 @@ public class ProBasicDataDictionary extends Model {
     /**
      * 编号
      */
-    @TableId(value = "ID", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

alarm-web/src/main/java/com/gyee/alarm/service/auto/impl/ProBasicDeviceMetricsServiceImpl.java

@@ -28,10 +28,10 @@ public class ProBasicDeviceMetricsServiceImpl extends ServiceImpl<ProBasicDevice
 
 
         if (StringUtils.isNotEmpty(deviceId)) {
-            qw.like("deviceiD", deviceId);
+            qw.like("devicei_d", deviceId);
         }
         if (StringUtils.isNotEmpty(structCode)) {
-            qw.like("structureCode", structCode);
+            qw.like("structure_code", structCode);
         }
             List<ProBasicDeviceMetrics> list = baseMapper.selectList(qw);
             return list;

alarm-web/src/main/java/com/gyee/alarm/service/auto/impl/ProBasicEquipmentPointServiceImpl.java

@@ -33,6 +33,8 @@ public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquip
         if (uniformcodeList_AI != null && !uniformcodeList_AI.isEmpty()) {
             qw.in("uniform_code", uniformcodeList_AI);
         }
+            qw.ne("nem_code", "INITIAL");
+
         List<ProBasicEquipmentPoint> list = baseMapper.selectList(qw);
         return list;
     }
@@ -47,6 +49,8 @@ public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquip
         if (uniformcodeList_AI != null && !uniformcodeList_AI.isEmpty()) {
             qw.in("uniform_code", uniformcodeList_AI);
         }
+            qw.ne("nem_code", "INITIAL");
+
         List<ProBasicEquipmentPoint> list = baseMapper.selectList(qw);
         return list;
     }