lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/ControlSystem.java

@@ -17,7 +17,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("ControlSystem")
@TableName("controlSystem")
@ApiModel(value = "控制系统表")
public class ControlSystem implements Serializable {
    private static final long serialVersionUID = 1529244980533421687L;

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/Equipment.java

@@ -20,7 +20,7 @@
 * @Version: V1.0
 */
@Data
@TableName("Equipment")
@TableName("equipment")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "Equipment对象", description = "采集设备表")

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentAlarm.java

@@ -14,7 +14,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("EquipmentAlarm")
@TableName("equipmentAlarm")
public class EquipmentAlarm implements Serializable {

    private static final long serialVersionUID = -4762333096168370779L;

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentBaseInfo.java

@@ -19,7 +19,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("EquipmentBaseInfo")
@TableName("cquipmentBaseInfo")
@ApiModel(value = "设备base表")
public class EquipmentBaseInfo implements Serializable {
    private static final long serialVersionUID = -8896213546634351881L;

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentBeilvAlarm.java

@@ -19,7 +19,7 @@
 * @Version: V1.0
 */
@Data
@TableName("EquipmentBeilvAlarm")
@TableName("equipmentBeilvAlarm")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "EquipmentBeilvAlarm对象", description = "设备倍率报警")

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentLog.java

@@ -16,7 +16,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("EquipmentLog")
@TableName("equipmentLog")
@ApiModel(value = "设备历史表")
public class EquipmentLog implements Serializable {


 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentRunningTrace.java

@@ -16,7 +16,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("EquipmentRunningTrace")
@TableName("equipmentRunningTrace")
public class EquipmentRunningTrace implements Serializable {

    private static final long serialVersionUID = 2229764130687476736L;

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentStatisticalInfo.java

@@ -13,7 +13,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("EquipmentStatisticalInfo")
@TableName("equipmentStatisticalInfo")
public class EquipmentStatisticalInfo implements Serializable {
    /**
     * 设备ID

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/EquipmentXYZ.java

@@ -17,7 +17,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("EquipmentXYZ")
@TableName("equipmentXYZ")
public class EquipmentXYZ implements Serializable {
    private static final long serialVersionUID = -959998605407088842L;


 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/XYZAliases.java

@@ -17,7 +17,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("XYZAliases")
@TableName("xYZAliases")
@ApiModel(value = "设备坐标采集")
public class XYZAliases extends JeecgEntity implements Serializable {


 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentMapper.java

@@ -25,7 +25,7 @@
    @Insert(" INSERT INTO ${tableName} SELECT * FROM ${lastTableName}  WHERE CollectTime < '${date}' ")
    void insertTableData(@Param("tableName") String tableName, @Param("lastTableName") String lastTableName, @Param("date") String date);

    @Delete(" delete from ${tableName} where CollectTime < '${day}' ")
    @Delete("delete from ${tableName} where CollectTime < '${day}' ")
    void deleteTableData(@Param("tableName") String saveTableName, @Param("day") String day);

    @Insert("CREATE TABLE `{tableName}` AS SELECT * FROM `{lastTableName}` WHERE CollectTime < '${date}' ")

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java

@@ -32,7 +32,7 @@
    List<Map<String, Object>> getWorkLineList(Map<String, Object> param);

    @InterceptorIgnore(tenantLine = "1")
    @Select("SELECT COUNT(*) FROM SysObjects WHERE XType='U' AND name = '${tableName}'")
    @Select("SELECT COUNT(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE () AND TABLE_NAME = '${tableName}'")
    Integer isTableExist(@Param("tableName") String tableName);

    @InterceptorIgnore(tenantLine = "1")

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java

@@ -69,8 +69,8 @@
            String tableName = "";
            Boolean isTableExist = false;
            if (equip != null) {
                if (StringUtils.isNotBlank(equip.getDrivetype())) {
                    tableName = equip.getDrivetype() + "_" + equip.getEquipmentid();
                if (StringUtils.isNotBlank(equip.getSavetablename())) {
                    tableName = equip.getSavetablename();
                    isTableExist = equipmentWorkLineService.isTableExist(tableName);
                }
            }