diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 833437c..ba4c596 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -168,7 +168,8 @@ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "waterMeterList.xlsx"); Map var = new HashMap<>(); - var.put("标题", "设备数据列表"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 833437c..ba4c596 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -168,7 +168,8 @@ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "waterMeterList.xlsx"); Map var = new HashMap<>(); - var.put("标题", "设备数据列表"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 0000e65..90799f2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -329,7 +329,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime @@ -860,7 +860,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 833437c..ba4c596 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -168,7 +168,8 @@ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "waterMeterList.xlsx"); Map var = new HashMap<>(); - var.put("标题", "设备数据列表"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 0000e65..90799f2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -329,7 +329,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime @@ -860,7 +860,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java index 3fa5a03..587fcfe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java @@ -103,13 +103,12 @@ @Override public List listByDevice(Page page, String devcode, String beginTime, String endTime) { - Page gasFlowPage = new Page<>(page.getCurrent(), page.getSize()); EntityWrapper query = new EntityWrapper(); query.eq("DEVCODE", devcode); if (!ToolUtil.isAllEmpty(beginTime, endTime)) { query.between("UPTIME", beginTime, endTime); } - List list = baseMapper.selectPage(gasFlowPage, query); + List list = baseMapper.selectPage(page, query); return list; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 833437c..ba4c596 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -168,7 +168,8 @@ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "waterMeterList.xlsx"); Map var = new HashMap<>(); - var.put("标题", "设备数据列表"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 0000e65..90799f2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -329,7 +329,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime @@ -860,7 +860,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java index 3fa5a03..587fcfe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java @@ -103,13 +103,12 @@ @Override public List listByDevice(Page page, String devcode, String beginTime, String endTime) { - Page gasFlowPage = new Page<>(page.getCurrent(), page.getSize()); EntityWrapper query = new EntityWrapper(); query.eq("DEVCODE", devcode); if (!ToolUtil.isAllEmpty(beginTime, endTime)) { query.between("UPTIME", beginTime, endTime); } - List list = baseMapper.selectPage(gasFlowPage, query); + List list = baseMapper.selectPage(page, query); return list; } diff --git a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java index 7a02482..dcb3972 100644 --- a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java @@ -2,6 +2,9 @@ import org.springframework.core.io.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; + public class StoreDTO { private String model; private String key; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 833437c..ba4c596 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -168,7 +168,8 @@ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "waterMeterList.xlsx"); Map var = new HashMap<>(); - var.put("标题", "设备数据列表"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 0000e65..90799f2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -329,7 +329,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime @@ -860,7 +860,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java index 3fa5a03..587fcfe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java @@ -103,13 +103,12 @@ @Override public List listByDevice(Page page, String devcode, String beginTime, String endTime) { - Page gasFlowPage = new Page<>(page.getCurrent(), page.getSize()); EntityWrapper query = new EntityWrapper(); query.eq("DEVCODE", devcode); if (!ToolUtil.isAllEmpty(beginTime, endTime)) { query.between("UPTIME", beginTime, endTime); } - List list = baseMapper.selectPage(gasFlowPage, query); + List list = baseMapper.selectPage(page, query); return list; } diff --git a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java index 7a02482..dcb3972 100644 --- a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java @@ -2,6 +2,9 @@ import org.springframework.core.io.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; + public class StoreDTO { private String model; private String key; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java index d3bfabc..bf7291e 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java @@ -5,7 +5,7 @@ CO(0, "CO浓度","ppm"), CH4(1, "CH4浓度","%VOL"), H2S(2, "H2S浓度","ppm"), - O2(3, "O2浓度","%VOL"); + O2(3, "O₂浓度","%VOL"); //SWITCH(4, "液位开关",""); private int code; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 833437c..ba4c596 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -168,7 +168,8 @@ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "waterMeterList.xlsx"); Map var = new HashMap<>(); - var.put("标题", "设备数据列表"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 0000e65..90799f2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -329,7 +329,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime @@ -860,7 +860,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java index 3fa5a03..587fcfe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java @@ -103,13 +103,12 @@ @Override public List listByDevice(Page page, String devcode, String beginTime, String endTime) { - Page gasFlowPage = new Page<>(page.getCurrent(), page.getSize()); EntityWrapper query = new EntityWrapper(); query.eq("DEVCODE", devcode); if (!ToolUtil.isAllEmpty(beginTime, endTime)) { query.between("UPTIME", beginTime, endTime); } - List list = baseMapper.selectPage(gasFlowPage, query); + List list = baseMapper.selectPage(page, query); return list; } diff --git a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java index 7a02482..dcb3972 100644 --- a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java @@ -2,6 +2,9 @@ import org.springframework.core.io.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; + public class StoreDTO { private String model; private String key; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java index d3bfabc..bf7291e 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java @@ -5,7 +5,7 @@ CO(0, "CO浓度","ppm"), CH4(1, "CH4浓度","%VOL"), H2S(2, "H2S浓度","ppm"), - O2(3, "O2浓度","%VOL"); + O2(3, "O₂浓度","%VOL"); //SWITCH(4, "液位开关",""); private int code; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java index 2a2e099..e20dfda 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java @@ -58,9 +58,9 @@ private String getAlarmName(String deviceType) { switch (deviceType) { case "15": - return "CO2用量报警"; + return "CO₂用量报警"; case "16": - return "O2用气报警"; + return "O₂用气报警"; case "17": return "燃气用气报警"; default: diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 833437c..ba4c596 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -168,7 +168,8 @@ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "waterMeterList.xlsx"); Map var = new HashMap<>(); - var.put("标题", "设备数据列表"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 0000e65..90799f2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -329,7 +329,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime @@ -860,7 +860,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java index 3fa5a03..587fcfe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java @@ -103,13 +103,12 @@ @Override public List listByDevice(Page page, String devcode, String beginTime, String endTime) { - Page gasFlowPage = new Page<>(page.getCurrent(), page.getSize()); EntityWrapper query = new EntityWrapper(); query.eq("DEVCODE", devcode); if (!ToolUtil.isAllEmpty(beginTime, endTime)) { query.between("UPTIME", beginTime, endTime); } - List list = baseMapper.selectPage(gasFlowPage, query); + List list = baseMapper.selectPage(page, query); return list; } diff --git a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java index 7a02482..dcb3972 100644 --- a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java @@ -2,6 +2,9 @@ import org.springframework.core.io.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; + public class StoreDTO { private String model; private String key; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java index d3bfabc..bf7291e 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java @@ -5,7 +5,7 @@ CO(0, "CO浓度","ppm"), CH4(1, "CH4浓度","%VOL"), H2S(2, "H2S浓度","ppm"), - O2(3, "O2浓度","%VOL"); + O2(3, "O₂浓度","%VOL"); //SWITCH(4, "液位开关",""); private int code; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java index 2a2e099..e20dfda 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java @@ -58,9 +58,9 @@ private String getAlarmName(String deviceType) { switch (deviceType) { case "15": - return "CO2用量报警"; + return "CO₂用量报警"; case "16": - return "O2用气报警"; + return "O₂用气报警"; case "17": return "燃气用气报警"; default: diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java index 2da390a..205e7fd 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java @@ -171,9 +171,9 @@ private String getTotalName(String deviceType) { switch (deviceType) { case "15": - return "CO2用气总量"; + return "CO₂用气总量"; case "16": - return "O2用气总量"; + return "O₂用气总量"; case "17": return "燃气用气总量"; default: @@ -184,9 +184,9 @@ private String getAlarmName(String deviceType) { switch (deviceType) { case "15": - return "CO2用量报警"; + return "CO₂用量报警"; case "16": - return "O2用气报警"; + return "O₂用气报警"; case "17": return "燃气用气报警"; default: diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 833437c..ba4c596 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -168,7 +168,8 @@ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "waterMeterList.xlsx"); Map var = new HashMap<>(); - var.put("标题", "设备数据列表"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 0000e65..90799f2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -329,7 +329,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime @@ -860,7 +860,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java index 3fa5a03..587fcfe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java @@ -103,13 +103,12 @@ @Override public List listByDevice(Page page, String devcode, String beginTime, String endTime) { - Page gasFlowPage = new Page<>(page.getCurrent(), page.getSize()); EntityWrapper query = new EntityWrapper(); query.eq("DEVCODE", devcode); if (!ToolUtil.isAllEmpty(beginTime, endTime)) { query.between("UPTIME", beginTime, endTime); } - List list = baseMapper.selectPage(gasFlowPage, query); + List list = baseMapper.selectPage(page, query); return list; } diff --git a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java index 7a02482..dcb3972 100644 --- a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java @@ -2,6 +2,9 @@ import org.springframework.core.io.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; + public class StoreDTO { private String model; private String key; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java index d3bfabc..bf7291e 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java @@ -5,7 +5,7 @@ CO(0, "CO浓度","ppm"), CH4(1, "CH4浓度","%VOL"), H2S(2, "H2S浓度","ppm"), - O2(3, "O2浓度","%VOL"); + O2(3, "O₂浓度","%VOL"); //SWITCH(4, "液位开关",""); private int code; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java index 2a2e099..e20dfda 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java @@ -58,9 +58,9 @@ private String getAlarmName(String deviceType) { switch (deviceType) { case "15": - return "CO2用量报警"; + return "CO₂用量报警"; case "16": - return "O2用气报警"; + return "O₂用气报警"; case "17": return "燃气用气报警"; default: diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java index 2da390a..205e7fd 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java @@ -171,9 +171,9 @@ private String getTotalName(String deviceType) { switch (deviceType) { case "15": - return "CO2用气总量"; + return "CO₂用气总量"; case "16": - return "O2用气总量"; + return "O₂用气总量"; case "17": return "燃气用气总量"; default: @@ -184,9 +184,9 @@ private String getAlarmName(String deviceType) { switch (deviceType) { case "15": - return "CO2用量报警"; + return "CO₂用量报警"; case "16": - return "O2用气报警"; + return "O₂用气报警"; case "17": return "燃气用气报警"; default: diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index f02022e..5b74ebf 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -53,7 +53,7 @@ super.getSession().setAttribute(PermissionContant.IS_APP, false); SuccessResponseData resultData = new SuccessResponseData(); if (ToolUtil.isOneEmpty(username, password)) { - username = "admin"; + username = "qdgq"; password = "111111"; } Subject currentUser = ShiroKit.getSubject(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index cb9709b..694f7b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -77,8 +77,9 @@ String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); String areaId = httpServletRequest.getParameter("areaId"); - if (areaId.indexOf("00") > 0) + if(areaId.indexOf("00") > 0){ areaId = areaId.substring(0, areaId.indexOf("00")); + } Page> page = new PageFactory>().defaultPage("alarmTime", false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 48886ca..f6a0361 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -262,9 +262,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + @@ -293,9 +293,9 @@ AND aj.CREATE_TIME = ]]> #{beginTime} AND aj.CREATE_TIME #{endTime} - - - + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 77f8c24..3d94d41 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -59,8 +59,8 @@ - and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) - OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')) + and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%')) + OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%'))) AND ar.ALARM_TYPE = #{alarmType} @@ -163,7 +163,7 @@ AND STATUS='1' - + UPDATE alarm_job SET JOB_STATUS='3' WHERE DEVCODE = #{devcode} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java index 610fb33..1ee91c5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java @@ -14,6 +14,8 @@ import com.casic.missiles.modular.system.service.IGasFlowService; import io.swagger.annotations.ApiOperation; import org.hswebframework.expands.office.excel.ExcelIO; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.util.ObjectUtils; @@ -63,7 +65,7 @@ Page page = new PageFactory().defaultPage(); List lists = gasFlowService.listByDevice(page, devcode, beginTime, endTime); page.setRecords(lists); - return ResponseData.success(lists); + return ResponseData.success(super.packForBT(page)); } @ApiOperation(value = "获取气体流量计数据列表") @@ -129,8 +131,6 @@ Page> page = new PageFactory>().defaultPage(); String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - String beginTime = httpServletRequest.getParameter("beginTime"); - String endTime = httpServletRequest.getParameter("endTime"); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); page.setOffset(0); @@ -189,11 +189,8 @@ httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "GasFlowList.xlsx"); Map var = new HashMap<>(); - String tempTime = ""; - if (StringUtils.isEmpty(beginTime)) { - tempTime = beginTime + "-" + endTime; - } - var.put("标题", "燃气设备数据列表"+tempTime); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); @@ -207,5 +204,4 @@ fileInputStream.close(); } } - } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 833437c..ba4c596 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -168,7 +168,8 @@ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "waterMeterList.xlsx"); Map var = new HashMap<>(); - var.put("标题", "设备数据列表"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + var.put("标题", "设备数据列表"+"(导出时间"+sdf.format(new Date())+")"); var.put("list", list); ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 0000e65..90799f2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -329,7 +329,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime @@ -860,7 +860,7 @@ dhg.CO AS CO, dhg.CH4 AS CH4, dhg.H2S AS H2S, - dhg.O2 AS O2, + dhg.O2 AS O₂, dhg.SWITCH AS switch, DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime, DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java index 3fa5a03..587fcfe 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java @@ -103,13 +103,12 @@ @Override public List listByDevice(Page page, String devcode, String beginTime, String endTime) { - Page gasFlowPage = new Page<>(page.getCurrent(), page.getSize()); EntityWrapper query = new EntityWrapper(); query.eq("DEVCODE", devcode); if (!ToolUtil.isAllEmpty(beginTime, endTime)) { query.between("UPTIME", beginTime, endTime); } - List list = baseMapper.selectPage(gasFlowPage, query); + List list = baseMapper.selectPage(page, query); return list; } diff --git a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java index 7a02482..dcb3972 100644 --- a/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java +++ b/casic-device/src/main/java/com/casic/missiles/store/StoreDTO.java @@ -2,6 +2,9 @@ import org.springframework.core.io.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; + public class StoreDTO { private String model; private String key; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java index d3bfabc..bf7291e 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/HarmfulGasBusiness.java @@ -5,7 +5,7 @@ CO(0, "CO浓度","ppm"), CH4(1, "CH4浓度","%VOL"), H2S(2, "H2S浓度","ppm"), - O2(3, "O2浓度","%VOL"); + O2(3, "O₂浓度","%VOL"); //SWITCH(4, "液位开关",""); private int code; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java index 2a2e099..e20dfda 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java @@ -58,9 +58,9 @@ private String getAlarmName(String deviceType) { switch (deviceType) { case "15": - return "CO2用量报警"; + return "CO₂用量报警"; case "16": - return "O2用气报警"; + return "O₂用气报警"; case "17": return "燃气用气报警"; default: diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java index 2da390a..205e7fd 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java @@ -171,9 +171,9 @@ private String getTotalName(String deviceType) { switch (deviceType) { case "15": - return "CO2用气总量"; + return "CO₂用气总量"; case "16": - return "O2用气总量"; + return "O₂用气总量"; case "17": return "燃气用气总量"; default: @@ -184,9 +184,9 @@ private String getAlarmName(String deviceType) { switch (deviceType) { case "15": - return "CO2用量报警"; + return "CO₂用量报警"; case "16": - return "O2用气报警"; + return "O₂用气报警"; case "17": return "燃气用气报警"; default: diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index f02022e..5b74ebf 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -53,7 +53,7 @@ super.getSession().setAttribute(PermissionContant.IS_APP, false); SuccessResponseData resultData = new SuccessResponseData(); if (ToolUtil.isOneEmpty(username, password)) { - username = "admin"; + username = "qdgq"; password = "111111"; } Subject currentUser = ShiroKit.getSubject(); diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index ffda306..b071761 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -38,7 +38,7 @@ spring-session-open: true #开启spring session smartcity: config: - export-path: D:\workspace\server\well\smartwell_qd\casic-web\src\main\resources\config\export\ + export-path: D:\cz\203\青岛石油\code\smartwell_qd\casic-web\src\main\resources\config\export\ #export-path: D:\export\ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\ config-path: D:\cz\203\workspace\smartwell_qd\casic-web\src\main\resources\config\temp\