diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 091145c..eb23728 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -15,11 +15,11 @@ - SELECT FROM ALARM_NOW_VIEW w WHERE 1 = 1 ORDER BY alarmTimeDate DESC + SELECT FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC - SELECT FROM ALARM_NOW_VIEW w WHERE 1 = 1 ORDER BY alarmTimeDate DESC + SELECT FROM alarm_now_view w WHERE 1 = 1 ORDER BY alarmTimeDate DESC SELECT - SD.SIMPLENAME AS deptname, + SD.simple_name AS deptname, SA.alarmDevices, SA.alarmTimes, SD.ID AS "DEPTID" - FROM SYS_DEPT SD + FROM sys_dept SD LEFT JOIN ( SELECT @@ -937,7 +937,7 @@ GROUP BY DEPTID ) SA ON SA.DEPTID = SD.ID - AND SD.DEPTTYPE = '03' + AND SD.dept_type = '03' diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 091145c..eb23728 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -15,11 +15,11 @@ SELECT - SD.SIMPLENAME AS deptname, + SD.simple_name AS deptname, SA.alarmDevices, SA.alarmTimes, SD.ID AS "DEPTID" - FROM SYS_DEPT SD + FROM sys_dept SD LEFT JOIN ( SELECT @@ -937,7 +937,7 @@ GROUP BY DEPTID ) SA ON SA.DEPTID = SD.ID - AND SD.DEPTTYPE = '03' + AND SD.dept_type = '03' diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index c72d233..068c750 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -494,7 +495,7 @@ mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords); } for (Map map : mapList) { - map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); + map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid")))); setCompany(map); if ("liquid".equals(sensorType)) { float liquiddata = Float.valueOf(String.valueOf(map.get("data"))); @@ -538,7 +539,7 @@ } private void setCompany(Map dataMap) { if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) { - List parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString()); + List parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid"))); if (CollectionUtil.isNotEmpty(parentDepts)) { Long companyId = parentDepts.get(parentDepts.size() - 1); dataMap.put("companyId", companyId); diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 091145c..eb23728 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -15,11 +15,11 @@ SELECT - SD.SIMPLENAME AS deptname, + SD.simple_name AS deptname, SA.alarmDevices, SA.alarmTimes, SD.ID AS "DEPTID" - FROM SYS_DEPT SD + FROM sys_dept SD LEFT JOIN ( SELECT @@ -937,7 +937,7 @@ GROUP BY DEPTID ) SA ON SA.DEPTID = SD.ID - AND SD.DEPTTYPE = '03' + AND SD.dept_type = '03' diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index c72d233..068c750 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -494,7 +495,7 @@ mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords); } for (Map map : mapList) { - map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); + map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid")))); setCompany(map); if ("liquid".equals(sensorType)) { float liquiddata = Float.valueOf(String.valueOf(map.get("data"))); @@ -538,7 +539,7 @@ } private void setCompany(Map dataMap) { if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) { - List parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString()); + List parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid"))); if (CollectionUtil.isNotEmpty(parentDepts)) { Long companyId = parentDepts.get(parentDepts.size() - 1); dataMap.put("companyId", companyId); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java index 28b8191..e198987 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java @@ -4,7 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -30,6 +32,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ExcelIgnoreUnannotated +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @TableName("bus_concentrator") @Data public class BusConcentrator extends Model { @@ -149,7 +152,7 @@ @ExcelProperty("状态") @TableField(exist = false) private String statusName; - @ExcelProperty("权属单位") + @ExcelProperty("权属单位名称") @TableField(exist = false) private String deptName; @TableField(exist = false) diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 091145c..eb23728 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -15,11 +15,11 @@ SELECT - SD.SIMPLENAME AS deptname, + SD.simple_name AS deptname, SA.alarmDevices, SA.alarmTimes, SD.ID AS "DEPTID" - FROM SYS_DEPT SD + FROM sys_dept SD LEFT JOIN ( SELECT @@ -937,7 +937,7 @@ GROUP BY DEPTID ) SA ON SA.DEPTID = SD.ID - AND SD.DEPTTYPE = '03' + AND SD.dept_type = '03' diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index c72d233..068c750 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -494,7 +495,7 @@ mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords); } for (Map map : mapList) { - map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); + map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid")))); setCompany(map); if ("liquid".equals(sensorType)) { float liquiddata = Float.valueOf(String.valueOf(map.get("data"))); @@ -538,7 +539,7 @@ } private void setCompany(Map dataMap) { if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) { - List parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString()); + List parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid"))); if (CollectionUtil.isNotEmpty(parentDepts)) { Long companyId = parentDepts.get(parentDepts.size() - 1); dataMap.put("companyId", companyId); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java index 28b8191..e198987 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java @@ -4,7 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -30,6 +32,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ExcelIgnoreUnannotated +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @TableName("bus_concentrator") @Data public class BusConcentrator extends Model { @@ -149,7 +152,7 @@ @ExcelProperty("状态") @TableField(exist = false) private String statusName; - @ExcelProperty("权属单位") + @ExcelProperty("权属单位名称") @TableField(exist = false) private String deptName; @TableField(exist = false) diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index bc15ac7..0b19af8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -25,6 +25,7 @@ @TableName("bus_well_info") @HeadRowHeight(15) @ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @ExcelIgnoreUnannotated @Data public class BusWellInfo extends Model { diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 091145c..eb23728 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -15,11 +15,11 @@ SELECT - SD.SIMPLENAME AS deptname, + SD.simple_name AS deptname, SA.alarmDevices, SA.alarmTimes, SD.ID AS "DEPTID" - FROM SYS_DEPT SD + FROM sys_dept SD LEFT JOIN ( SELECT @@ -937,7 +937,7 @@ GROUP BY DEPTID ) SA ON SA.DEPTID = SD.ID - AND SD.DEPTTYPE = '03' + AND SD.dept_type = '03' diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index c72d233..068c750 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -494,7 +495,7 @@ mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords); } for (Map map : mapList) { - map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); + map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid")))); setCompany(map); if ("liquid".equals(sensorType)) { float liquiddata = Float.valueOf(String.valueOf(map.get("data"))); @@ -538,7 +539,7 @@ } private void setCompany(Map dataMap) { if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) { - List parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString()); + List parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid"))); if (CollectionUtil.isNotEmpty(parentDepts)) { Long companyId = parentDepts.get(parentDepts.size() - 1); dataMap.put("companyId", companyId); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java index 28b8191..e198987 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java @@ -4,7 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -30,6 +32,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ExcelIgnoreUnannotated +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @TableName("bus_concentrator") @Data public class BusConcentrator extends Model { @@ -149,7 +152,7 @@ @ExcelProperty("状态") @TableField(exist = false) private String statusName; - @ExcelProperty("权属单位") + @ExcelProperty("权属单位名称") @TableField(exist = false) private String deptName; @TableField(exist = false) diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index bc15ac7..0b19af8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -25,6 +25,7 @@ @TableName("bus_well_info") @HeadRowHeight(15) @ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @ExcelIgnoreUnannotated @Data public class BusWellInfo extends Model { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 04bdc34..19b3ac2 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -62,6 +62,12 @@ casic-core ${core.version} + + + com.casic + casic-alarm + ${pro.version} + com.casic casic-export-support diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 091145c..eb23728 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -15,11 +15,11 @@ SELECT - SD.SIMPLENAME AS deptname, + SD.simple_name AS deptname, SA.alarmDevices, SA.alarmTimes, SD.ID AS "DEPTID" - FROM SYS_DEPT SD + FROM sys_dept SD LEFT JOIN ( SELECT @@ -937,7 +937,7 @@ GROUP BY DEPTID ) SA ON SA.DEPTID = SD.ID - AND SD.DEPTTYPE = '03' + AND SD.dept_type = '03' diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index c72d233..068c750 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -494,7 +495,7 @@ mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords); } for (Map map : mapList) { - map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); + map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid")))); setCompany(map); if ("liquid".equals(sensorType)) { float liquiddata = Float.valueOf(String.valueOf(map.get("data"))); @@ -538,7 +539,7 @@ } private void setCompany(Map dataMap) { if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) { - List parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString()); + List parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid"))); if (CollectionUtil.isNotEmpty(parentDepts)) { Long companyId = parentDepts.get(parentDepts.size() - 1); dataMap.put("companyId", companyId); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java index 28b8191..e198987 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java @@ -4,7 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -30,6 +32,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ExcelIgnoreUnannotated +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @TableName("bus_concentrator") @Data public class BusConcentrator extends Model { @@ -149,7 +152,7 @@ @ExcelProperty("状态") @TableField(exist = false) private String statusName; - @ExcelProperty("权属单位") + @ExcelProperty("权属单位名称") @TableField(exist = false) private String deptName; @TableField(exist = false) diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index bc15ac7..0b19af8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -25,6 +25,7 @@ @TableName("bus_well_info") @HeadRowHeight(15) @ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @ExcelIgnoreUnannotated @Data public class BusWellInfo extends Model { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 04bdc34..19b3ac2 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -62,6 +62,12 @@ casic-core ${core.version} + + + com.casic + casic-alarm + ${pro.version} + com.casic casic-export-support diff --git a/casic-web/src/main/resources/META-INF/spring-devtools.properties b/casic-web/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index e3b0a7f..0000000 --- a/casic-web/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.beetl=/beetl-2.7.15.jar \ No newline at end of file diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 091145c..eb23728 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -15,11 +15,11 @@ SELECT - SD.SIMPLENAME AS deptname, + SD.simple_name AS deptname, SA.alarmDevices, SA.alarmTimes, SD.ID AS "DEPTID" - FROM SYS_DEPT SD + FROM sys_dept SD LEFT JOIN ( SELECT @@ -937,7 +937,7 @@ GROUP BY DEPTID ) SA ON SA.DEPTID = SD.ID - AND SD.DEPTTYPE = '03' + AND SD.dept_type = '03' diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index c72d233..068c750 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -494,7 +495,7 @@ mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords); } for (Map map : mapList) { - map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); + map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid")))); setCompany(map); if ("liquid".equals(sensorType)) { float liquiddata = Float.valueOf(String.valueOf(map.get("data"))); @@ -538,7 +539,7 @@ } private void setCompany(Map dataMap) { if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) { - List parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString()); + List parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid"))); if (CollectionUtil.isNotEmpty(parentDepts)) { Long companyId = parentDepts.get(parentDepts.size() - 1); dataMap.put("companyId", companyId); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java index 28b8191..e198987 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java @@ -4,7 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -30,6 +32,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ExcelIgnoreUnannotated +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @TableName("bus_concentrator") @Data public class BusConcentrator extends Model { @@ -149,7 +152,7 @@ @ExcelProperty("状态") @TableField(exist = false) private String statusName; - @ExcelProperty("权属单位") + @ExcelProperty("权属单位名称") @TableField(exist = false) private String deptName; @TableField(exist = false) diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index bc15ac7..0b19af8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -25,6 +25,7 @@ @TableName("bus_well_info") @HeadRowHeight(15) @ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @ExcelIgnoreUnannotated @Data public class BusWellInfo extends Model { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 04bdc34..19b3ac2 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -62,6 +62,12 @@ casic-core ${core.version} + + + com.casic + casic-alarm + ${pro.version} + com.casic casic-export-support diff --git a/casic-web/src/main/resources/META-INF/spring-devtools.properties b/casic-web/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index e3b0a7f..0000000 --- a/casic-web/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.beetl=/beetl-2.7.15.jar \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 88e2879..c559b2d 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -55,8 +55,8 @@ appKey: bhPeCutJVdAyOasevQFtN9 masterSecret: lChudND74A89WRiHLkedb5 logging: - level.root: info - level.com.stylefeng: debug + level.root: error + level.com.casic: error file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 091145c..eb23728 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -15,11 +15,11 @@ SELECT - SD.SIMPLENAME AS deptname, + SD.simple_name AS deptname, SA.alarmDevices, SA.alarmTimes, SD.ID AS "DEPTID" - FROM SYS_DEPT SD + FROM sys_dept SD LEFT JOIN ( SELECT @@ -937,7 +937,7 @@ GROUP BY DEPTID ) SA ON SA.DEPTID = SD.ID - AND SD.DEPTTYPE = '03' + AND SD.dept_type = '03' diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index c72d233..068c750 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -494,7 +495,7 @@ mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords); } for (Map map : mapList) { - map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); + map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid")))); setCompany(map); if ("liquid".equals(sensorType)) { float liquiddata = Float.valueOf(String.valueOf(map.get("data"))); @@ -538,7 +539,7 @@ } private void setCompany(Map dataMap) { if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) { - List parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString()); + List parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid"))); if (CollectionUtil.isNotEmpty(parentDepts)) { Long companyId = parentDepts.get(parentDepts.size() - 1); dataMap.put("companyId", companyId); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java index 28b8191..e198987 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java @@ -4,7 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -30,6 +32,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ExcelIgnoreUnannotated +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @TableName("bus_concentrator") @Data public class BusConcentrator extends Model { @@ -149,7 +152,7 @@ @ExcelProperty("状态") @TableField(exist = false) private String statusName; - @ExcelProperty("权属单位") + @ExcelProperty("权属单位名称") @TableField(exist = false) private String deptName; @TableField(exist = false) diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index bc15ac7..0b19af8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -25,6 +25,7 @@ @TableName("bus_well_info") @HeadRowHeight(15) @ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @ExcelIgnoreUnannotated @Data public class BusWellInfo extends Model { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 04bdc34..19b3ac2 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -62,6 +62,12 @@ casic-core ${core.version} + + + com.casic + casic-alarm + ${pro.version} + com.casic casic-export-support diff --git a/casic-web/src/main/resources/META-INF/spring-devtools.properties b/casic-web/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index e3b0a7f..0000000 --- a/casic-web/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.beetl=/beetl-2.7.15.jar \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 88e2879..c559b2d 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -55,8 +55,8 @@ appKey: bhPeCutJVdAyOasevQFtN9 masterSecret: lChudND74A89WRiHLkedb5 logging: - level.root: info - level.com.stylefeng: debug + level.root: error + level.com.casic: error file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 6343e70..8870fcf 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -13,8 +13,6 @@ bootstrap-servers: localhost:9092 consumer: # 指定默认消费者group id group-id: 21e87b6b-175d-4600-a1f0-690c360ce532 - jms: - pub-sub-domain: true mybatis-plus: global-config: enable-sql-runner: true diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 88f7dc3..9faa8c2 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -10,7 +10,7 @@ casic-alarm - 2.0.0 + 2.0.0.alpha jar casic-alarm casic 告警服务子包 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 091145c..eb23728 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -15,11 +15,11 @@ SELECT - SD.SIMPLENAME AS deptname, + SD.simple_name AS deptname, SA.alarmDevices, SA.alarmTimes, SD.ID AS "DEPTID" - FROM SYS_DEPT SD + FROM sys_dept SD LEFT JOIN ( SELECT @@ -937,7 +937,7 @@ GROUP BY DEPTID ) SA ON SA.DEPTID = SD.ID - AND SD.DEPTTYPE = '03' + AND SD.dept_type = '03' diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index c72d233..068c750 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -494,7 +495,7 @@ mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords); } for (Map map : mapList) { - map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); + map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid")))); setCompany(map); if ("liquid".equals(sensorType)) { float liquiddata = Float.valueOf(String.valueOf(map.get("data"))); @@ -538,7 +539,7 @@ } private void setCompany(Map dataMap) { if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) { - List parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString()); + List parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid"))); if (CollectionUtil.isNotEmpty(parentDepts)) { Long companyId = parentDepts.get(parentDepts.size() - 1); dataMap.put("companyId", companyId); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java index 28b8191..e198987 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java @@ -4,7 +4,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -30,6 +32,7 @@ @HeadRowHeight(15) @ContentRowHeight(20) @ExcelIgnoreUnannotated +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @TableName("bus_concentrator") @Data public class BusConcentrator extends Model { @@ -149,7 +152,7 @@ @ExcelProperty("状态") @TableField(exist = false) private String statusName; - @ExcelProperty("权属单位") + @ExcelProperty("权属单位名称") @TableField(exist = false) private String deptName; @TableField(exist = false) diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index bc15ac7..0b19af8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -25,6 +25,7 @@ @TableName("bus_well_info") @HeadRowHeight(15) @ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) @ExcelIgnoreUnannotated @Data public class BusWellInfo extends Model { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 04bdc34..19b3ac2 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -62,6 +62,12 @@ casic-core ${core.version} + + + com.casic + casic-alarm + ${pro.version} + com.casic casic-export-support diff --git a/casic-web/src/main/resources/META-INF/spring-devtools.properties b/casic-web/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index e3b0a7f..0000000 --- a/casic-web/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.beetl=/beetl-2.7.15.jar \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 88e2879..c559b2d 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -55,8 +55,8 @@ appKey: bhPeCutJVdAyOasevQFtN9 masterSecret: lChudND74A89WRiHLkedb5 logging: - level.root: info - level.com.stylefeng: debug + level.root: error + level.com.casic: error file: path: logs/ name: missiles.log \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 6343e70..8870fcf 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -13,8 +13,6 @@ bootstrap-servers: localhost:9092 consumer: # 指定默认消费者group id group-id: 21e87b6b-175d-4600-a1f0-690c360ce532 - jms: - pub-sub-domain: true mybatis-plus: global-config: enable-sql-runner: true diff --git a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx index ff33e6b..4858800 100644 --- a/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx +++ b/casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx Binary files differ