From c27e778d60074a715ddc5789ca813ac52e37678d Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 24 Jul 2024 14:48:22 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mh/user/component/ReceiveHandler.java | 2 +- .../user/controller/DataResultController.java | 58 ++++++------- .../user/controller/DeviceInfoController.java | 20 ++--- .../user/controller/EnergyDataController.java | 4 +- .../user/controller/MeterInfoController.java | 6 +- .../controller/ProjectInfoController.java | 2 +- .../user/controller/SerialPortController.java | 4 +- .../controller/StrategyInfoController.java | 6 +- .../mh/user/controller/SysMenuController.java | 8 +- .../mh/user/controller/SysUserController.java | 4 +- .../mh/user/controller/TestController.java | 2 +- .../com/mh/user/entity/DataResultEntity.java | 2 +- .../mh/user/entity/DeviceCodeParamEntity.java | 2 +- .../mh/user/entity/DeviceInstallEntity.java | 2 +- .../java/com/mh/user/entity/EnergyEntity.java | 2 +- .../com/mh/user/entity/EnergySumEntity.java | 2 +- .../com/mh/user/entity/ProjectInfoEntity.java | 2 +- .../java/com/mh/user/job/DealDataJob.java | 8 +- .../mh/user/mapper/DataResultChMapper.java | 12 +-- .../user/mapper/DataResultChillerMapper.java | 32 ++++---- .../mh/user/mapper/DataResultClBakMapper.java | 4 +- .../mh/user/mapper/DataResultClMapper.java | 6 +- .../mapper/DataResultFifteenMiMapper.java | 6 +- .../user/mapper/DataResultFiveMiMapper.java | 6 +- .../com/mh/user/mapper/DataResultMapper.java | 10 +-- .../mh/user/mapper/DataResultNowMapper.java | 12 +-- .../mh/user/mapper/DataResultOneMiMapper.java | 22 ++--- .../com/mh/user/mapper/DeviceCodeMapper.java | 36 ++++---- .../mh/user/mapper/DeviceCodeParamMapper.java | 12 +-- .../com/mh/user/mapper/DeviceInfoMapper.java | 34 ++++---- .../mh/user/mapper/DeviceInstallMapper.java | 45 +++++----- .../com/mh/user/mapper/EnergyDataMapper.java | 22 ++--- .../java/com/mh/user/mapper/EnergyMapper.java | 18 ++-- .../com/mh/user/mapper/MeterInfoMapper.java | 2 +- .../com/mh/user/mapper/ProjectInfoMapper.java | 4 +- .../mh/user/mapper/StrategyInfoMapper.java | 6 +- .../com/mh/user/mapper/SysMenuMapper.java | 6 +- .../user/mapper/chillers/DealDataMapper.java | 10 +-- .../mapper/provider/DataResultProvider.java | 60 +++++++------- .../mapper/provider/DeviceInfoProvider.java | 6 +- .../mapper/provider/EnergyDataProvider.java | 82 +++++++++---------- .../user/mapper/provider/EnergyProvider.java | 48 +++++------ .../mapper/provider/MeterInfoProvider.java | 6 +- .../java/com/mh/user/model/EnergyModel.java | 2 +- .../java/com/mh/user/model/EnergyParam.java | 2 +- .../java/com/mh/user/model/QueueParam.java | 2 +- .../main/java/com/mh/user/model/SysMenu.java | 2 +- .../main/java/com/mh/user/model/SysUser.java | 2 +- .../com/mh/user/netty/EchoServerHandler.java | 34 ++++---- .../user/security/UserDetailsServiceImpl.java | 2 +- .../serialport/SerialPortSendReceive.java | 2 +- .../mh/user/serialport/SerialPortSingle.java | 2 +- .../mh/user/service/DataResultService.java | 22 ++--- .../user/service/DeviceCodeParamService.java | 2 +- .../mh/user/service/DeviceInfoService.java | 8 +- .../com/mh/user/service/MeterInfoService.java | 2 +- .../mh/user/service/StrategyInfoService.java | 2 +- .../service/chillers/DealDataService.java | 4 +- .../chillers/impl/DealDataServiceImpl.java | 8 +- .../service/impl/DataResultServiceImpl.java | 73 +++++++++-------- .../impl/DeviceCodeParamServiceImpl.java | 4 +- .../service/impl/DeviceInfoServiceImpl.java | 16 ++-- .../service/impl/EnergyDataServiceImpl.java | 28 +++---- .../user/service/impl/EnergyServiceImpl.java | 20 ++--- .../service/impl/MeterInfoServiceImpl.java | 4 +- .../service/impl/StrategyInfoServiceImpl.java | 4 +- .../com/mh/user/sqlmapper/SysMenuMapper.xml | 6 +- .../user/utils/AnalysisReceiveOrder485.java | 46 +++++------ .../com/mh/user/utils/GetReadOrder485.java | 2 +- .../src/main/java/com/mh/user/utils/Test.java | 2 +- .../src/main/resources/application-prod.yml | 7 +- .../src/main/resources/application-test.yml | 5 ++ .../test/java/com/mh/user/ReportTest1.java | 4 +- .../java/com/mh/user/chart/ChartTest.java | 2 +- 74 files changed, 487 insertions(+), 477 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/component/ReceiveHandler.java b/user-service/src/main/java/com/mh/user/component/ReceiveHandler.java index 558c87e..e4e96f3 100644 --- a/user-service/src/main/java/com/mh/user/component/ReceiveHandler.java +++ b/user-service/src/main/java/com/mh/user/component/ReceiveHandler.java @@ -40,7 +40,7 @@ public class ReceiveHandler { queueParam.setRecData(JSONObj.getString("recData")); queueParam.setDeviceType(JSONObj.getString("deviceType")); queueParam.setRegisterAddr(JSONObj.getString("registerAddr")); - queueParam.setProjectID(JSONObj.getString("projectID")); + queueParam.setProjectId(JSONObj.getString("projectId")); queueParam.setCopyTime(JSONObj.getString("copyTime")); String deviceType=JSONObj.getString("deviceType"); show=deviceType+",数据:"+JSONObj.getString("recData"); diff --git a/user-service/src/main/java/com/mh/user/controller/DataResultController.java b/user-service/src/main/java/com/mh/user/controller/DataResultController.java index e49f766..6ad5d4b 100644 --- a/user-service/src/main/java/com/mh/user/controller/DataResultController.java +++ b/user-service/src/main/java/com/mh/user/controller/DataResultController.java @@ -25,7 +25,7 @@ public class DataResultController { @SysLogger(value="中央空调",optDesc = "数据分析查询") @PostMapping(value="/query") - public HttpResult queryDataResult(@RequestParam(value = "projectID", required = false) String projectID, + public HttpResult queryDataResult(@RequestParam(value = "projectId", required = false) String projectId, @RequestParam(value= "startDate", required=false)String startDate, @RequestParam(value= "endDate", required=false)String endDate, @RequestParam(value= "deviceType", required=false)String deviceType, @@ -34,8 +34,8 @@ public class DataResultController { try{ - int count=dataResultService.getDataResultCount(projectID,startDate,endDate,deviceType,page,limit); - List records=dataResultService.queryDataResult(projectID,startDate,endDate,deviceType,page,limit); + int count=dataResultService.getDataResultCount(projectId,startDate,endDate,deviceType,page,limit); + List records=dataResultService.queryDataResult(projectId,startDate,endDate,deviceType,page,limit); return HttpResult.ok(count,records); }catch (Exception e){ @@ -46,44 +46,44 @@ public class DataResultController { @SysLogger(value="中央空调",optDesc = "能耗分析按小时查询") @PostMapping(value="/hour") - public HttpResult queryDataResultMi(@RequestParam(value= "projectID", required=false)String projectID, + public HttpResult queryDataResultMi(@RequestParam(value = "projectId", required=false)String projectId, @RequestParam(value= "dateType", required=false)String dateType, @RequestParam(value= "curDate", required=false)String curDate, @RequestParam(value="page", required=false) int page, @RequestParam(value="limit", required=false) int limit) { try{ - if(projectID!=null && projectID.length()>0){ + if(projectId!=null && projectId.length()>0){ String startDate=""; curDate=curDate.substring(0,16)+":00"; if (dateType.equals("1小时")){ startDate= ExchangeStringUtil.dateRoll(1,curDate); - List records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,0); - int count=dataResultService.dataResultOneMiCount(projectID,startDate,curDate); + List records=dataResultService.queryDataResultMi(projectId,startDate,curDate,page,limit,0); + int count=dataResultService.dataResultOneMiCount(projectId,startDate,curDate); return HttpResult.ok(count,records); }else if (dateType.equals("2小时")){ startDate=ExchangeStringUtil.dateRoll(2,curDate); - List records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,0); - int count=dataResultService.dataResultOneMiCount(projectID,startDate,curDate); + List records=dataResultService.queryDataResultMi(projectId,startDate,curDate,page,limit,0); + int count=dataResultService.dataResultOneMiCount(projectId,startDate,curDate); return HttpResult.ok(count,records); }else if (dateType.equals("8小时")){ startDate=ExchangeStringUtil.dateRoll(8,curDate); - List records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,1); - int count=dataResultService.dataResultFiveMiCount(projectID,startDate,curDate); + List records=dataResultService.queryDataResultMi(projectId,startDate,curDate,page,limit,1); + int count=dataResultService.dataResultFiveMiCount(projectId,startDate,curDate); return HttpResult.ok(count,records); }else if (dateType.equals("12小时")){ startDate=ExchangeStringUtil.dateRoll(12,curDate); - List records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,1); - int count=dataResultService.dataResultFiveMiCount(projectID,startDate,curDate); + List records=dataResultService.queryDataResultMi(projectId,startDate,curDate,page,limit,1); + int count=dataResultService.dataResultFiveMiCount(projectId,startDate,curDate); return HttpResult.ok(count,records); }else if (dateType.equals("24小时")){ startDate=ExchangeStringUtil.dateRoll(24,curDate); - List records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,2); - int count=dataResultService.dataResultFifteenMiCount(projectID,startDate,curDate); + List records=dataResultService.queryDataResultMi(projectId,startDate,curDate,page,limit,2); + int count=dataResultService.dataResultFifteenMiCount(projectId,startDate,curDate); return HttpResult.ok(count,records); }else{ //1小时 startDate=ExchangeStringUtil.dateRoll(1,curDate); - List records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,0); - int count=dataResultService.dataResultOneMiCount(projectID,startDate,curDate); + List records=dataResultService.queryDataResultMi(projectId,startDate,curDate,page,limit,0); + int count=dataResultService.dataResultOneMiCount(projectId,startDate,curDate); return HttpResult.ok(count,records); } }else{ @@ -97,7 +97,7 @@ public class DataResultController { @SysLogger(value="中央空调",optDesc = "能耗分析按分钟查询") @PostMapping(value="/minute") - public HttpResult queryDataResultSec(@RequestParam(value= "projectID", required=false)String projectID, + public HttpResult queryDataResultSec(@RequestParam(value = "projectId", required=false)String projectId, @RequestParam(value= "dateType", required=false)String dateType, @RequestParam(value= "curDate", required=false)String curDate, @RequestParam(value="page",required=false) int page, @@ -111,7 +111,7 @@ public class DataResultController { curDate=curDate.substring(0,16)+":00"; if (dateType.equals("1分钟")){ startDate= ExchangeStringUtil.dateTime(1,curDate); - List records=dataResultService.queryDataResultSec(projectID,startDate,curDate); + List records=dataResultService.queryDataResultSec(projectId,startDate,curDate); String deviceAddr=records.get(0).getDeviceAddr(); String projectName=records.get(0).getProjectName(); @@ -139,7 +139,7 @@ public class DataResultController { }else if (dateType.equals("2分钟")){ startDate=ExchangeStringUtil.dateTime(2,curDate); - List records=dataResultService.queryDataResultSec(projectID,startDate,curDate); + List records=dataResultService.queryDataResultSec(projectId,startDate,curDate); String deviceAddr=records.get(0).getDeviceAddr(); String projectName=records.get(0).getProjectName(); //Date date=df.parse(startDate);//顺序 @@ -165,7 +165,7 @@ public class DataResultController { return HttpResult.ok(120,listMap); }else if (dateType.equals("5分钟")){ startDate=ExchangeStringUtil.dateTime(5,curDate); - List records=dataResultService.queryDataResultSec(projectID,startDate,curDate); + List records=dataResultService.queryDataResultSec(projectId,startDate,curDate); String deviceAddr=records.get(0).getDeviceAddr(); String projectName=records.get(0).getProjectName(); String s=startDate.substring(18,19); @@ -200,7 +200,7 @@ public class DataResultController { return HttpResult.ok(60,listMap); }else if (dateType.equals("15分钟")){ startDate=ExchangeStringUtil.dateTime(15,curDate); - List records=dataResultService.queryDataResultSec(projectID,startDate,curDate); + List records=dataResultService.queryDataResultSec(projectId,startDate,curDate); String deviceAddr=records.get(0).getDeviceAddr(); String projectName=records.get(0).getProjectName(); String s=startDate.substring(18,19); @@ -235,7 +235,7 @@ public class DataResultController { return HttpResult.ok(180,listMap); }else if (dateType.equals("30分钟")){ startDate=ExchangeStringUtil.dateTime(30,curDate); - List records=dataResultService.queryDataResultSec(projectID,startDate,curDate); + List records=dataResultService.queryDataResultSec(projectId,startDate,curDate); String deviceAddr=records.get(0).getDeviceAddr(); String projectName=records.get(0).getProjectName(); String s=startDate.substring(18,19); @@ -269,7 +269,7 @@ public class DataResultController { return HttpResult.ok(180,listMap); }else{ //1分钟 startDate= ExchangeStringUtil.dateTime(1,curDate); - List records=dataResultService.queryDataResultSec(projectID,startDate,curDate); + List records=dataResultService.queryDataResultSec(projectId,startDate,curDate); String deviceAddr=records.get(0).getDeviceAddr(); String projectName=records.get(0).getProjectName(); //Date date=df.parse(startDate); @@ -305,15 +305,15 @@ public class DataResultController { @PostMapping(value="/dataNow") public HttpResult selectDataResultNow(@RequestParam(value= "deviceAddr", required=false)String deviceAddr, @RequestParam(value= "deviceType", required=false)String deviceType, - @RequestParam(value= "projectID", required=false)String projectID) { + @RequestParam(value = "projectId", required=false)String projectId) { - List dataNow=dataResultService.selectDataResultNow(deviceAddr, deviceType, projectID); + List dataNow=dataResultService.selectDataResultNow(deviceAddr, deviceType, projectId); return HttpResult.ok("success",dataNow); } @SysLogger(value="中央空调",optDesc = "查询冷水机参数值") @PostMapping(value="/dataChiller") - public HttpResult queryDataResultChiller(@RequestParam("projectID")String projectID, + public HttpResult queryDataResultChiller(@RequestParam("projectId")String projectId, @RequestParam("deviceAddr")String deviceAddr, @RequestParam("registerName")String registerName, @RequestParam(value= "startDate", required=false)String startDate, @@ -321,8 +321,8 @@ public class DataResultController { @RequestParam("page")int page, @RequestParam("limit")int limit) { - int count=dataResultService.dataResultChillerCount(projectID,deviceAddr, registerName, startDate, curDate); - List dataChiller=dataResultService.queryDataResultChiller(projectID,deviceAddr,registerName,startDate,curDate,page,limit); + int count=dataResultService.dataResultChillerCount(projectId,deviceAddr, registerName, startDate, curDate); + List dataChiller=dataResultService.queryDataResultChiller(projectId,deviceAddr,registerName,startDate,curDate,page,limit); return HttpResult.ok(count,dataChiller); } } diff --git a/user-service/src/main/java/com/mh/user/controller/DeviceInfoController.java b/user-service/src/main/java/com/mh/user/controller/DeviceInfoController.java index a0a7ab5..d6dfeb0 100644 --- a/user-service/src/main/java/com/mh/user/controller/DeviceInfoController.java +++ b/user-service/src/main/java/com/mh/user/controller/DeviceInfoController.java @@ -23,35 +23,35 @@ public class DeviceInfoController { @SysLogger(value="设备信息",optDesc = "查询设备信息") @PostMapping("/query") - public HttpResult queryMeterInfo(@RequestParam(value = "systemID") String systemID, - @RequestParam(value = "projectID") String projectID, + public HttpResult queryMeterInfo(@RequestParam(value = "systemId") String systemID, + @RequestParam(value = "projectId") String projectId, @RequestParam(value = "deviceType", required = false) String deviceType){ - List list=deviceInfoService.queryDeviceInfo(systemID,projectID,deviceType); + List list=deviceInfoService.queryDeviceInfo(systemID,projectId,deviceType); return HttpResult.ok(list); } @SysLogger(value="设备信息",optDesc = "查询冷水机列表") @PostMapping("/list") - public HttpResult selectDevices(@RequestParam(value = "systemID") String systemID, - @RequestParam(value = "projectID") String projectID){ - List list=deviceInfoService.selectDevices(projectID); + public HttpResult selectDevices(@RequestParam(value = "systemId") String systemID, + @RequestParam(value = "projectId") String projectId){ + List list=deviceInfoService.selectDevices(projectId); return HttpResult.ok(list); } @SysLogger(value="设备信息",optDesc = "查询多个冷水机相关信息") @PostMapping("/chillers") - public HttpResult queryChiller(@RequestParam(value = "projectID") String projectID, + public HttpResult queryChiller(@RequestParam(value = "projectId") String projectId, @RequestParam(value = "deviceAddr") String deviceAddr){ - List list=deviceInfoService.queryChiller(projectID,deviceAddr); + List list=deviceInfoService.queryChiller(projectId,deviceAddr); return HttpResult.ok(list); } @SysLogger(value="设备信息",optDesc = "查询单个冷水机相关信息") @PostMapping("/chiller") - public HttpResult selectChiller(@RequestParam(value = "projectID") String projectID, + public HttpResult selectChiller(@RequestParam(value = "projectId") String projectId, @RequestParam(value = "deviceAddr") String deviceAddr){ - ChillerModel chillerModel=deviceInfoService.selectChiller(projectID,deviceAddr); + ChillerModel chillerModel=deviceInfoService.selectChiller(projectId,deviceAddr); return HttpResult.ok(chillerModel); } } diff --git a/user-service/src/main/java/com/mh/user/controller/EnergyDataController.java b/user-service/src/main/java/com/mh/user/controller/EnergyDataController.java index 7a7eae4..83c811e 100644 --- a/user-service/src/main/java/com/mh/user/controller/EnergyDataController.java +++ b/user-service/src/main/java/com/mh/user/controller/EnergyDataController.java @@ -23,8 +23,8 @@ public class EnergyDataController { @PostMapping("/query") public HttpResult queryEnergyData(@RequestBody EnergyModel energyModel){ try{ - String projectID=energyModel.getProjectID(); - if(projectID!=null && projectID.length()>0){ + String projectId=energyModel.getProjectId(); + if(projectId!=null && projectId.length()>0){ List list=energyDataService.queryEnergyData(energyModel); int count=energyDataService.getEnergyDataCount(energyModel); return HttpResult.ok(count,list); diff --git a/user-service/src/main/java/com/mh/user/controller/MeterInfoController.java b/user-service/src/main/java/com/mh/user/controller/MeterInfoController.java index 49b67ac..2a52887 100644 --- a/user-service/src/main/java/com/mh/user/controller/MeterInfoController.java +++ b/user-service/src/main/java/com/mh/user/controller/MeterInfoController.java @@ -21,10 +21,10 @@ public class MeterInfoController { @SysLogger(value="基表信息",optDesc = "查询基表信息") @PostMapping("/query") - public HttpResult queryMeterInfo(@RequestParam(value = "systemID",required = false) String systemID, - @RequestParam(value = "projectID",required = false) String projectID){ + public HttpResult queryMeterInfo(@RequestParam(value = "systemId",required = false) String systemID, + @RequestParam(value = "projectId",required = false) String projectId){ - List list=meterInfoService.queryMeterInfo(systemID,projectID); + List list=meterInfoService.queryMeterInfo(systemID,projectId); return HttpResult.ok(list); } } diff --git a/user-service/src/main/java/com/mh/user/controller/ProjectInfoController.java b/user-service/src/main/java/com/mh/user/controller/ProjectInfoController.java index 2b49870..3d006e7 100644 --- a/user-service/src/main/java/com/mh/user/controller/ProjectInfoController.java +++ b/user-service/src/main/java/com/mh/user/controller/ProjectInfoController.java @@ -21,7 +21,7 @@ public class ProjectInfoController { @SysLogger(value="项目信息",optDesc = "查询项目信息") @PostMapping("/queryPro") - public HttpResult queryProject(@RequestParam(value = "systemID")String systemID) { + public HttpResult queryProject(@RequestParam(value = "systemId")String systemID) { List list=projectInfoService.queryProjectInfo(systemID); return HttpResult.ok(list); diff --git a/user-service/src/main/java/com/mh/user/controller/SerialPortController.java b/user-service/src/main/java/com/mh/user/controller/SerialPortController.java index 42850c1..8b6e0c2 100644 --- a/user-service/src/main/java/com/mh/user/controller/SerialPortController.java +++ b/user-service/src/main/java/com/mh/user/controller/SerialPortController.java @@ -46,13 +46,13 @@ public class SerialPortController { deviceCodeParam.setBaudRate(deviceInstallEntity.getBaudRate()); deviceCodeParam.setParity(deviceInstallEntity.getParity()); deviceCodeParam.setDataValue(serialPortModel.getDataValue());//传入相关参数值 - deviceCodeParam.setProjectID(buildingId); + deviceCodeParam.setProjectId(buildingId); String brand=deviceInstallEntity.getBrand();//品牌 deviceCodeParam.setBrand(brand); ControlSetEntity controlData=new ControlSetEntity(); //设置设备实体对象 - controlData.setBuildingId(deviceInstallEntity.getProjectID()); + controlData.setBuildingId(deviceInstallEntity.getProjectId()); if (deviceType==null || deviceType.equals("") || deviceType.equals("热泵")){ if (param==null || param.equals("") || param.equals("温度设定")){ diff --git a/user-service/src/main/java/com/mh/user/controller/StrategyInfoController.java b/user-service/src/main/java/com/mh/user/controller/StrategyInfoController.java index c55f563..866d95f 100644 --- a/user-service/src/main/java/com/mh/user/controller/StrategyInfoController.java +++ b/user-service/src/main/java/com/mh/user/controller/StrategyInfoController.java @@ -20,9 +20,9 @@ public class StrategyInfoController { @SysLogger(value="节能策略查询") @RequestMapping("query") - public HttpResult queryStrategyInfo(@RequestParam(value = "systemID",required = false) String systemID, - @RequestParam(value = "projectID",required = false) String projectID){ - List list=strategyInfoService.queryStrategyInfo(systemID,projectID); + public HttpResult queryStrategyInfo(@RequestParam(value = "systemId",required = false) String systemID, + @RequestParam(value = "projectId",required = false) String projectId){ + List list=strategyInfoService.queryStrategyInfo(systemID,projectId); return HttpResult.ok(list); } } diff --git a/user-service/src/main/java/com/mh/user/controller/SysMenuController.java b/user-service/src/main/java/com/mh/user/controller/SysMenuController.java index e28e93f..cb750ee 100644 --- a/user-service/src/main/java/com/mh/user/controller/SysMenuController.java +++ b/user-service/src/main/java/com/mh/user/controller/SysMenuController.java @@ -39,12 +39,12 @@ public class SysMenuController { //查询菜单树,用户ID和用户名为空则查询全部，获取菜单类型，0：获取所有菜单，包含按钮，1：获取所有菜单，不包含按钮 @GetMapping(value="/findNavTree") - public HttpResult findNavTree(@RequestParam String systemID,@RequestParam String userName) { - return HttpResult.ok(sysMenuService.findTree(systemID,userName, 0)); + public HttpResult findNavTree(@RequestParam String systemId,@RequestParam String userName) { + return HttpResult.ok(sysMenuService.findTree(systemId,userName, 0)); } @GetMapping(value="/findMenuTree") - public HttpResult findMenuTree(@RequestParam String systemID) { - return HttpResult.ok(sysMenuService.findTree(systemID,"", 0)); + public HttpResult findMenuTree(@RequestParam String systemId) { + return HttpResult.ok(sysMenuService.findTree(systemId,"", 0)); } } diff --git a/user-service/src/main/java/com/mh/user/controller/SysUserController.java b/user-service/src/main/java/com/mh/user/controller/SysUserController.java index d8b791f..5c2f6e9 100644 --- a/user-service/src/main/java/com/mh/user/controller/SysUserController.java +++ b/user-service/src/main/java/com/mh/user/controller/SysUserController.java @@ -109,8 +109,8 @@ public class SysUserController { @GetMapping(value="/findPermissions") - public HttpResult findPermissions(@RequestParam String systemID,@RequestParam String name) { - return HttpResult.ok(sysUserService.findPermissions(systemID,name)); + public HttpResult findPermissions(@RequestParam String systemId,@RequestParam String name) { + return HttpResult.ok(sysUserService.findPermissions(systemId,name)); } @GetMapping(value="/findUserRoles") diff --git a/user-service/src/main/java/com/mh/user/controller/TestController.java b/user-service/src/main/java/com/mh/user/controller/TestController.java index e933cda..d701b21 100644 --- a/user-service/src/main/java/com/mh/user/controller/TestController.java +++ b/user-service/src/main/java/com/mh/user/controller/TestController.java @@ -69,7 +69,7 @@ public class TestController { deviceCodeParamEntity.setRegisterAddr("34"); deviceCodeParamEntity.setRegisterName("累积量"); deviceCodeParamEntity.setGrade(1); - deviceCodeParamEntity.setProjectID("3"); + deviceCodeParamEntity.setProjectId("3"); analysis.analysisCloudOrder485("5A0304AEF600D911B6",deviceCodeParamEntity); // analysis.analysisWtMeterOrder485("FEFEFE6810398710810000008116901F00006502002C006502002C0000000000000000FF3416","",""); diff --git a/user-service/src/main/java/com/mh/user/entity/DataResultEntity.java b/user-service/src/main/java/com/mh/user/entity/DataResultEntity.java index 495690c..105b03e 100644 --- a/user-service/src/main/java/com/mh/user/entity/DataResultEntity.java +++ b/user-service/src/main/java/com/mh/user/entity/DataResultEntity.java @@ -28,5 +28,5 @@ public class DataResultEntity { private int grade; private String havedUpdate; private String projectName; - private String projectID; + private String projectId; } diff --git a/user-service/src/main/java/com/mh/user/entity/DeviceCodeParamEntity.java b/user-service/src/main/java/com/mh/user/entity/DeviceCodeParamEntity.java index ba46ff7..378fcc7 100644 --- a/user-service/src/main/java/com/mh/user/entity/DeviceCodeParamEntity.java +++ b/user-service/src/main/java/com/mh/user/entity/DeviceCodeParamEntity.java @@ -29,6 +29,6 @@ public class DeviceCodeParamEntity { private int grade; //级别 private String dataValue; //传入值 private Date createTime; - private String projectID; + private String projectId; } diff --git a/user-service/src/main/java/com/mh/user/entity/DeviceInstallEntity.java b/user-service/src/main/java/com/mh/user/entity/DeviceInstallEntity.java index f88b51c..d7c66d7 100644 --- a/user-service/src/main/java/com/mh/user/entity/DeviceInstallEntity.java +++ b/user-service/src/main/java/com/mh/user/entity/DeviceInstallEntity.java @@ -27,7 +27,7 @@ public class DeviceInstallEntity { private String brand; private String installPosition; private Date installDate; - private String projectID; + private String projectId; private String remarks; private String registerAddr; private String registerName; diff --git a/user-service/src/main/java/com/mh/user/entity/EnergyEntity.java b/user-service/src/main/java/com/mh/user/entity/EnergyEntity.java index 4cca484..5e61889 100644 --- a/user-service/src/main/java/com/mh/user/entity/EnergyEntity.java +++ b/user-service/src/main/java/com/mh/user/entity/EnergyEntity.java @@ -16,7 +16,7 @@ public class EnergyEntity { private int checkInCount; //楼栋人数 private double perElect; //平均用电 private double perWater; //平均用水 - private String projectID; //项目编号 + private String projectId; //项目编号 private String projectName; //项目名称 } diff --git a/user-service/src/main/java/com/mh/user/entity/EnergySumEntity.java b/user-service/src/main/java/com/mh/user/entity/EnergySumEntity.java index a280ad4..947559a 100644 --- a/user-service/src/main/java/com/mh/user/entity/EnergySumEntity.java +++ b/user-service/src/main/java/com/mh/user/entity/EnergySumEntity.java @@ -7,7 +7,7 @@ public class EnergySumEntity { private Long id; //序号 private String curDate; //日期 private String buildingId; //楼栋编号 - private String projectID; //项目编号 + private String projectId; //项目编号 private String useHotWater; //用水 private String electValue; //用电 private String electWater; //单耗 diff --git a/user-service/src/main/java/com/mh/user/entity/ProjectInfoEntity.java b/user-service/src/main/java/com/mh/user/entity/ProjectInfoEntity.java index c5d07c5..99ef8a7 100644 --- a/user-service/src/main/java/com/mh/user/entity/ProjectInfoEntity.java +++ b/user-service/src/main/java/com/mh/user/entity/ProjectInfoEntity.java @@ -13,7 +13,7 @@ public class ProjectInfoEntity { private int pScale; private String pic; //图片 private String tel; //电话 - private String systemID; //系统编号 + private String systemId; //系统编号 private String remarks; } diff --git a/user-service/src/main/java/com/mh/user/job/DealDataJob.java b/user-service/src/main/java/com/mh/user/job/DealDataJob.java index d52bfcc..94f446e 100644 --- a/user-service/src/main/java/com/mh/user/job/DealDataJob.java +++ b/user-service/src/main/java/com/mh/user/job/DealDataJob.java @@ -79,8 +79,8 @@ public class DealDataJob { String curDate= ExchangeStringUtil.dateTime(1,""); List list=dealDataService.queryProjectId("1"); if (!list.isEmpty()){ - for(String projectID:list){ - dealDataService.proDataResult(curDate,projectID); //1珠江酒店，2广合，3广大 + for(String projectId:list){ + dealDataService.proDataResult(curDate,projectId); //1珠江酒店，2广合，3广大 } } log.info("---------能效监测定时汇总，每一分钟！"+curDate); @@ -125,8 +125,8 @@ public class DealDataJob { String curDate=sdf1.format(calendar.getTime()); List list=dealDataService.queryProjectId("2"); if (!list.isEmpty()){ - for(String projectID:list){ - dealDataService.proEnergyDaySum(curDate,projectID); + for(String projectId:list){ + dealDataService.proEnergyDaySum(curDate,projectId); } } log.info("---------中央热水生产概况汇总，每一小时！"+curDate); diff --git a/user-service/src/main/java/com/mh/user/mapper/DataResultChMapper.java b/user-service/src/main/java/com/mh/user/mapper/DataResultChMapper.java index f07df77..e4be0da 100644 --- a/user-service/src/main/java/com/mh/user/mapper/DataResultChMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/DataResultChMapper.java @@ -20,7 +20,7 @@ public interface DataResultChMapper extends BaseMapper { //---------------------------------------------------------------------------------------------- //保存冷量计数据 @Insert("insert into data_result_ch(device_addr,device_type,fun_code,register_addr,register_name,cur_value,cur_date,project_id,grade) values (" + - " #{deviceAddr},#{deviceType},#{funCode},#{registerAddr},#{registerName},#{curValue},#{curDate},#{projectID},#{grade})") + " #{deviceAddr},#{deviceType},#{funCode},#{registerAddr},#{registerName},#{curValue},#{curDate},#{projectId},#{grade})") void saveDataResultCh(DataResultChEntity dataResultChEntity); @Update("") @@ -41,12 +41,12 @@ public interface DataResultChMapper extends BaseMapper { " where cur_date=#{curDate} " + " and device_addr=#{deviceAddr} " + " and register_addr=#{registerAddr} " + - " and project_id=#{projectID} " + + " and project_id=#{projectId} " + " and grade = #{grade} ") int selectDataResultChCount(@Param("curDate") String curDate, @Param("deviceAddr") String deviceAddr, @Param("registerAddr") String registerAddr, - @Param("projectID") String projectID, + @Param("projectId") String projectId, @Param("grade") int grade); @Select("select " + @@ -59,7 +59,7 @@ public interface DataResultChMapper extends BaseMapper { "join project_info t2 on " + " t1.project_id = t2.id " + "where " + - " t1.project_id = #{projectID} " + + " t1.project_id = #{projectId} " + " and t1.cur_date >= #{startDate} " + " and t1.cur_date <= #{curDate} " + "group by " + @@ -68,6 +68,6 @@ public interface DataResultChMapper extends BaseMapper { " t2.project_name " + "order by " + " t1.cur_date ") - List queryDataResultCh(@Param("projectID") String projectID, @Param("startDate") String startDate, @Param("curDate") String curDate); + List queryDataResultCh(@Param("projectId") String projectId, @Param("startDate") String startDate, @Param("curDate") String curDate); } diff --git a/user-service/src/main/java/com/mh/user/mapper/DataResultChillerMapper.java b/user-service/src/main/java/com/mh/user/mapper/DataResultChillerMapper.java index 62d8411..42d4235 100644 --- a/user-service/src/main/java/com/mh/user/mapper/DataResultChillerMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/DataResultChillerMapper.java @@ -21,7 +21,7 @@ public interface DataResultChillerMapper extends BaseMapper" + @@ -32,37 +32,37 @@ public interface DataResultChillerMapper extends BaseMapper , register_addr = #{registerAddr} " + " , register_name = #{registerName} " + " , cur_value = #{curValue} " + - " , project_id = #{projectID} " + + " , project_id = #{projectId} " + " , grade = #{grade} " + - " where cur_date=#{curDate} and device_addr=#{deviceAddr} and register_addr=#{registerAddr} and project_id=#{projectID} " + + " where cur_date=#{curDate} and device_addr=#{deviceAddr} and register_addr=#{registerAddr} and project_id=#{projectId} " + "") void updateDataResultChiller(DataResultChEntity dataResultChEntity); @Select("select count(*) from data_result_chiller where cur_date=#{curDate} " + " and device_addr=#{deviceAddr} " + " and register_addr=#{registerAddr} " + - " and project_id=#{projectID} " + + " and project_id=#{projectId} " + " and fun_code = #{funCode} ") int selectDataResultChillerCount(@Param("curDate") String curDate, @Param("deviceAddr") String deviceAddr, @Param("registerAddr") String registerAddr, - @Param("projectID") String projectID, + @Param("projectId") String projectId, @Param("funCode") String funCode); @Results({ - @Result(property="deviceAddr",column="deviceAddr"), - @Result(property="deviceType",column="deviceType"), - @Result(property="curDate",column="curDate"), - @Result(property ="curValue",column ="curValue"), - @Result(property="funCode",column="funCode"), - @Result(property="registerAddr",column="registerAddr"), - @Result(property="registerName",column="registerName"), + @Result(property="deviceAddr",column="device_addr"), + @Result(property="deviceType",column="device_type"), + @Result(property="curDate",column="cur_date"), + @Result(property ="curValue",column ="cur_value"), + @Result(property="funCode",column="fun_code"), + @Result(property="registerAddr",column="register_addr"), + @Result(property="registerName",column="register_name"), @Result(property="grade",column="grade"), - @Result(property="projectID",column="projectID"), + @Result(property="projectId",column="project_id"), @Result(property="projectName",column="project_name") }) @SelectProvider(type = DataResultProvider.class,method = "queryDataResultChiller") - List queryDataResultChiller(@Param("projectID") String projectID, + List queryDataResultChiller(@Param("projectId") String projectId, @Param("deviceAddr") String deviceAddr, @Param("registerName") String registerName, @Param("startDate") String startDate, @@ -71,7 +71,7 @@ public interface DataResultChillerMapper extends BaseMapper { @Insert("insert into data_result_cl_bak(device_addr,device_type,project_id,last_value,last_date,cur_value,cur_date,ratio,calc_value,grade,register_addr,register_name) values (" + - " #{deviceAddr},#{deviceType},#{projectID},#{lastValue},#{lastDate},#{curValue},#{curDate},#{ratio},#{calcValue},#{grade},#{registerAddr},#{registerName})") + " #{deviceAddr},#{deviceType},#{projectId},#{lastValue},#{lastDate},#{curValue},#{curDate},#{ratio},#{calcValue},#{grade},#{registerAddr},#{registerName})") void saveDataResultCl_bak(DataResultClEntity dataResultClEntity); @Select("select count(1) from data_result_cl_bak " + " where cur_date = #{curDate} " + " and device_addr = #{deviceAddr} " + - " and registerAddr = #{registerAddr} " + + " and register_addr = #{registerAddr} " + " and project_id = #{projectId} ") int selectDataResultChBakCount(@Param("curDate") String curDate, @Param("deviceAddr") String deviceAddr, diff --git a/user-service/src/main/java/com/mh/user/mapper/DataResultClMapper.java b/user-service/src/main/java/com/mh/user/mapper/DataResultClMapper.java index 7a9f32c..a7d12ef 100644 --- a/user-service/src/main/java/com/mh/user/mapper/DataResultClMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/DataResultClMapper.java @@ -18,15 +18,15 @@ import java.util.List; public interface DataResultClMapper extends BaseMapper { //---------------------------------------------------------------------------------------------- //保存冷量计数据 - @Insert("insert into data_result_cl(device_addr,device_type,project_id,last_value,last_date,cur_value,cur_date,ratio,calc_value,grade,register_addr,register_mame) values (" + - " #{deviceAddr},#{deviceType},#{projectID},#{lastValue},#{lastDate},#{curValue},#{curDate},#{ratio},#{calcValue},#{grade},#{registerAddr},#{registerName})") + @Insert("insert into data_result_cl(device_addr,device_type,project_id,last_value,last_date,cur_value,cur_date,ratio,calc_value,grade,register_addr,register_name) values (" + + " #{deviceAddr},#{deviceType},#{projectId},#{lastValue},#{lastDate},#{curValue},#{curDate},#{ratio},#{calcValue},#{grade},#{registerAddr},#{registerName})") void saveDataResultCl(DataResultClEntity dataResultClEntity); @Update("") void insertDeviceCodeParamList(@Param("deviceCodeParamEntityList") List deviceCodeParamEntityList); diff --git a/user-service/src/main/java/com/mh/user/mapper/DeviceInfoMapper.java b/user-service/src/main/java/com/mh/user/mapper/DeviceInfoMapper.java index c34d3f7..d1e9f84 100644 --- a/user-service/src/main/java/com/mh/user/mapper/DeviceInfoMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/DeviceInfoMapper.java @@ -27,31 +27,31 @@ public interface DeviceInfoMapper { @Result(property="systemId",column="system_id") }) List queryDeviceInfo(@Param("systemID") String systemID, - @Param("projectID") String projectID, + @Param("projectId") String projectId, @Param("deviceType") String deviceType); //查询单个冷水机相关信息 @Results({ @Result(column = "device_addr",property = "deviceAddr" ), @Result(column = "device_name", property = "deviceName"), - @Result(column = "runState", property = "runState"), - @Result(column = "setPoint", property = "setPoint"), - @Result(column = "enterChw", property = "enterChw"), - @Result(column = "leaveChw", property = "leaveChw"), - @Result(column = "enterCow", property = "enterCow"), - @Result(column = "leaveCow", property = "leaveCow"), + @Result(column = "run_state", property = "runState"), + @Result(column = "set_point", property = "setPoint"), + @Result(column = "enter_chw", property = "enterChw"), + @Result(column = "leave_chw", property = "leaveChw"), + @Result(column = "enter_cow", property = "enterCow"), + @Result(column = "leave_cow", property = "leaveCow"), @Result(column = "power", property = "power"), - @Result(column = "ratedPower", property = "ratedPower"), - @Result(column = "chillerAmps", property = "chillerAmps"), + @Result(column = "rated_power", property = "ratedPower"), + @Result(column = "chiller_amps", property = "chillerAmps"), @Result(column = "refrigeration", property = "refrigeration"), - @Result(column = "ratedRef", property = "ratedRef"), - @Result(column = "chwFlow", property = "chwFlow"), - @Result(column = "ApproachCow", property = "ApproachCow"), - @Result(column = "ApproachChw", property = "ApproachChw"), + @Result(column = "rated_ref", property = "ratedRef"), + @Result(column = "chw_flow", property = "chwFlow"), + @Result(column = "approach_cow", property = "ApproachCow"), + @Result(column = "approach_chw", property = "ApproachChw"), @Result(column = "cop", property = "cop"), - @Result(column = "ratedCop", property = "ratedCop"), - @Result(column = "copyDate", property = "copyDate") + @Result(column = "rated_cop", property = "ratedCop"), + @Result(column = "copy_date", property = "copyDate") }) - @Select("select * from chiller_data where project_id=#{projectID} and device_addr=#{deviceAddr} ") - ChillerModel selectChiller(@Param("projectID") String projectID,@Param("device_addr") String deviceAddr); + @Select("select * from chiller_data where project_id=#{projectId} and device_addr=#{deviceAddr} ") + ChillerModel selectChiller(@Param("projectId") String projectId,@Param("device_addr") String deviceAddr); } diff --git a/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java b/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java index 0ae5055..f5be580 100644 --- a/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java @@ -1,5 +1,6 @@ package com.mh.user.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mh.user.entity.DeviceInstallEntity; import com.mh.user.entity.DeviceInstallTempEntity; import com.mh.user.mapper.provider.DeviceInstallProvider; @@ -11,15 +12,15 @@ import java.util.Date; import java.util.List; @Mapper -public interface DeviceInstallMapper { +public interface DeviceInstallMapper extends BaseMapper { /** * 设备安装模块 * 保存设备信息 * @param deviceInstallEntity */ - @Insert("insert into device_code(device_addr,deviceName,deviceType,dataPort,ratio,baudRate,brand,project_id,installPosition,installDate) values (" + - " #{deviceAddr},#{deviceName},#{deviceType},#{dataCom},#{ratio},#{baudRate},#{brand},#{projectID},#{installPosition},getDate())") + @Insert("insert into device_code(device_addr,device_name,device_type,data_port,ratio,baud_rate,brand,project_id,install_position,install_date) values (" + + " #{deviceAddr},#{deviceName},#{deviceType},#{dataCom},#{ratio},#{baudRate},#{brand},#{projectId},#{installPosition},getDate())") int saveDevice(DeviceInstallEntity deviceInstallEntity); /** @@ -29,22 +30,22 @@ public interface DeviceInstallMapper { */ @Update("") int updateDevice(DeviceInstallEntity deviceInstallEntity); //按id更新水电表读数和采集日期 - @Update("update device_code set lastValue=#{lastValue},lastDate=#{lastDate} where id=#{id}") + @Update("update device_code set last_value=#{lastValue},last_date=#{lastDate} where id=#{id}") void updateLastValue(@Param("id") Long id, @Param("lastValue") BigDecimal lastValue, @Param("lastDate") Date lastDate); /** * 设备管理模块： @@ -69,7 +70,7 @@ public interface DeviceInstallMapper { @Result(property="installPosition",column="installPosition"), @Result(property="installDate",column="installDate"), @Result(property="remarks",column="remarks"), - @Result(property ="projectID",column ="project_id"), + @Result(property ="projectId",column ="project_id"), }) @Select("select * from ( " + "select *,ROW_NUMBER() over(order by id) as rn from device_code " + @@ -77,18 +78,16 @@ public interface DeviceInstallMapper { List getAllDevice(@Param("page") int page, @Param("limit") int limit); //查询有多个采集参数的设备 - @ResultMap("rs") @Select("select * from device_code where Project_id=#{ProjectID} ") List selectDeviceParams(@Param("ProjectID") String ProjectID); //查询有多个采集参数的设备 - @ResultMap("rs") @Select("select * from device_code ") List selectDeviceParams2(); //根据类型查询设备通讯号 - @Select("select top 1 device_addr from device_code where deviceType=#{deviceType} and project_id=#{projectID} ") - String selectDeviceAddr(@Param("deviceType") String deviceType,@Param("projectID") String projectID); + @Select("select top 1 device_addr from device_code where device_type=#{deviceType} and project_id=#{projectId} ") + String selectDeviceAddr(@Param("deviceType") String deviceType,@Param("projectId") String projectId); /** * 设备管理模块： @@ -100,8 +99,7 @@ public interface DeviceInstallMapper { @SelectProvider(type = DeviceInstallProvider.class,method = "queryDevice") - @ResultMap("rs") - List queryDevice(@Param("project_id") String projectID, + List queryDevice(@Param("project_id") String projectId, @Param("deviceType") String deviceType, @Param("startDate") String startDate, @Param("endDate")String endDate, @@ -116,7 +114,7 @@ public interface DeviceInstallMapper { * @return */ @SelectProvider(type = DeviceInstallProvider.class,method = "getCount") - int getCount(@Param("project_id") String projectID, + int getCount(@Param("project_id") String projectId, @Param("deviceType") String deviceType, @Param("startDate") String startDate, @Param("endDate")String endDate, @@ -130,9 +128,8 @@ public interface DeviceInstallMapper { int getIsOnlineCount(@Param("isOnline") String isOnline,@Param("deviceType") String deviceType); //根据通讯地址和设备类型查询对应的设备信息 - @ResultMap("rs") - @Select("select * from device_code where device_addr=#{deviceAddr} and deviceType=#{deviceType} and project_id=#{projectID}") - DeviceInstallEntity selectDevice(@Param("deviceAddr") String deviceAddr,@Param("deviceType") String deviceType,@Param("projectID") String projectID); + @Select("select * from device_code where device_addr=#{deviceAddr} and device_type=#{deviceType} and project_id=#{projectId}") + DeviceInstallEntity selectDevice(@Param("deviceAddr") String deviceAddr,@Param("deviceType") String deviceType,@Param("projectId") String projectId); /** * 设备管理模块： @@ -169,13 +166,13 @@ public interface DeviceInstallMapper { " end " + " ) as remarks " + " FROM device_install_temp " + - " ORDER BY ISNULL(remarks,'')　DESC ,row_id ") + " ORDER BY ISNULL(remarks,'') DESC ,row_id ") @Options(statementType = StatementType.CALLABLE) @Results({ @Result(column = "device_addr",property = "deviceAddr" ), @Result(column = "device_name", property = "deviceName"), @Result(column = "device_type", property = "deviceType"), - @Result(column = "baudRate", property = "baudRate"), + @Result(column = "baud_rate", property = "baudRate"), @Result(column = "data_com", property = "dataCom"), @Result(column = "ratio", property = "ratio"), @Result(column = "building_id", property = "buildingId"), @@ -206,7 +203,7 @@ public interface DeviceInstallMapper { void updateDevice_install_temp__multiple(); //从临时表查询插入 - @Insert("insert into device_install(device_addr,device_name,device_type,data_com,baudRate,ratio,building_id) select device_addr,device_name,device_type,data_com,baudRate,ratio,building_id from device_install_temp") + @Insert("insert into device_install(device_addr,device_name,device_type,data_com,baud_rate,ratio,building_id) select device_addr,device_name,device_type,data_com,baud_rate,ratio,building_id from device_install_temp") void insertFromDevice_install_temp(); //修改启动状态 diff --git a/user-service/src/main/java/com/mh/user/mapper/EnergyDataMapper.java b/user-service/src/main/java/com/mh/user/mapper/EnergyDataMapper.java index 8b83a88..a1dd4d1 100644 --- a/user-service/src/main/java/com/mh/user/mapper/EnergyDataMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/EnergyDataMapper.java @@ -14,7 +14,7 @@ public interface EnergyDataMapper extends BaseMapper { @SelectProvider(type = EnergyDataProvider.class, method = "queryEnergyDataMi") @Results(id = "rs", value = { @Result(property = "curDate", column = "cur_date"), - @Result(property = "projectID", column = "project_id"), + @Result(property = "projectId", column = "project_id"), @Result(property = "projectName", column = "project_name"), @Result(property = "ambTemp", column = "amb_Temp"), @Result(property = "humidity", column = "humidity"), @@ -23,13 +23,13 @@ public interface EnergyDataMapper extends BaseMapper { @Result(property = "cl", column = "cl"), @Result(property = "cop", column = "cop") }) - List queryEnergyDataMi(@Param("projectID") String projectID, + List queryEnergyDataMi(@Param("projectId") String projectId, @Param("curDate") String curDate, @Param("page") int page, @Param("limit") int limit); @SelectProvider(type = EnergyDataProvider.class, method = "getEnergyDataMiCount") - int getEnergyDataMiCount(@Param("projectID") String projectID, @Param("curDate") String curDate); + int getEnergyDataMiCount(@Param("projectId") String projectId, @Param("curDate") String curDate); //按小时 @SelectProvider(type = EnergyDataProvider.class, method = "queryEnergyDataHour") @@ -45,48 +45,48 @@ public interface EnergyDataMapper extends BaseMapper { @Result(property = "projectId", column = "project_id"), @Result(property = "projectName", column = "project_name") }) - List queryEnergyDataHour(@Param("projectID") String projectID, + List queryEnergyDataHour(@Param("projectId") String projectId, @Param("curDate") String curDate, @Param("page") int page, @Param("limit") int limit); @SelectProvider(type = EnergyDataProvider.class, method = "getEnergyDataHourCount") - int getEnergyDataHourCount(@Param("projectID") String projectID, @Param("curDate") String curDate); + int getEnergyDataHourCount(@Param("projectId") String projectId, @Param("curDate") String curDate); //按天 @SelectProvider(type = EnergyDataProvider.class, method = "queryEnergyDataDay") @ResultMap("rs") - List queryEnergyDataDay(@Param("projectID") String projectID, + List queryEnergyDataDay(@Param("projectId") String projectId, @Param("curDate") String curDate, @Param("queryType") int queryType, @Param("page") int page, @Param("limit") int limit); @SelectProvider(type = EnergyDataProvider.class, method = "getEnergyDataDayCount") - int getEnergyDataDayCount(@Param("projectID") String projectID, @Param("curDate") String curDate, @Param("queryType") int queryType); + int getEnergyDataDayCount(@Param("projectId") String projectId, @Param("curDate") String curDate, @Param("queryType") int queryType); //按月 @SelectProvider(type = EnergyDataProvider.class, method = "queryEnergyDataMonth") @ResultMap("rs") - List queryEnergyDataMonth(@Param("projectID") String projectID, + List queryEnergyDataMonth(@Param("projectId") String projectId, @Param("curDate") String curDate, @Param("queryType") int queryTyp, @Param("page") int page, @Param("limit") int limit); @SelectProvider(type = EnergyDataProvider.class, method = "getEnergyDataMonthCount") - int getEnergyDataMonthCount(@Param("projectID") String projectID, @Param("curDate") String curDate, @Param("queryType") int queryType); + int getEnergyDataMonthCount(@Param("projectId") String projectId, @Param("curDate") String curDate, @Param("queryType") int queryType); //按年 @SelectProvider(type = EnergyDataProvider.class, method = "queryEnergyDataYear") @ResultMap("rs") - List queryEnergyDataYear(@Param("projectID") String projectID, + List queryEnergyDataYear(@Param("projectId") String projectId, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("queryType") int queryType, @Param("page") int page, @Param("limit") int limit); @SelectProvider(type = EnergyDataProvider.class, method = "getEnergyDataYearCount") - int getEnergyDataYearCount(@Param("projectID") String projectID, + int getEnergyDataYearCount(@Param("projectId") String projectId, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("queryType") int queryType); diff --git a/user-service/src/main/java/com/mh/user/mapper/EnergyMapper.java b/user-service/src/main/java/com/mh/user/mapper/EnergyMapper.java index 706fba6..bbb802b 100644 --- a/user-service/src/main/java/com/mh/user/mapper/EnergyMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/EnergyMapper.java @@ -92,7 +92,7 @@ public interface EnergyMapper { /** * 生产信息 * 查询 - * @param projectID + * @param projectId * @param buildingId * @param startDate * @param queryType @@ -113,10 +113,10 @@ public interface EnergyMapper { @Result(property="checkInCount",column="check_in_count"), @Result(property="perElect",column="per_elect"), @Result(property="perWater",column="per_water"), - @Result(property="projectID",column="project_id"), + @Result(property="projectId",column="project_id"), @Result(property="projectName",column="project_name") }) - List queryEnergyHour(@Param("projectID") String projectID, + List queryEnergyHour(@Param("projectId") String projectId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("queryType") int queryType, @@ -125,7 +125,7 @@ public interface EnergyMapper { //按天 @SelectProvider(type = EnergyProvider.class,method = "queryEnergyDay") @ResultMap("rs") - List queryEnergyDay(@Param("projectID") String projectID, + List queryEnergyDay(@Param("projectId") String projectId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate, @@ -134,7 +134,7 @@ public interface EnergyMapper { //按月 @SelectProvider(type = EnergyProvider.class,method = "queryEnergyMonth") @ResultMap("rs") - List queryEnergyMonth(@Param("projectID") String projectID, + List queryEnergyMonth(@Param("projectId") String projectId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate, @@ -143,7 +143,7 @@ public interface EnergyMapper { //按年 @SelectProvider(type = EnergyProvider.class,method = "queryEnergyYear") @ResultMap("rs") - List queryEnergyYear(@Param("projectID") String projectID, + List queryEnergyYear(@Param("projectId") String projectId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate, @@ -157,21 +157,21 @@ public interface EnergyMapper { */ //按天 @SelectProvider(type = EnergyProvider.class,method = "getEnergyDayCount") - int getEnergyDayCount(@Param("projectID") String projectID, + int getEnergyDayCount(@Param("projectId") String projectId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("queryType") int queryType); //按月 @SelectProvider(type = EnergyProvider.class,method = "getEnergyMonthCount") - int getEnergyMonthCount(@Param("projectID") String projectID, + int getEnergyMonthCount(@Param("projectId") String projectId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("queryType") int queryType); //按年 @SelectProvider(type = EnergyProvider.class,method = "getEnergyYearCount") - int getEnergyYearCount(@Param("projectID") String projectID, + int getEnergyYearCount(@Param("projectId") String projectId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate, diff --git a/user-service/src/main/java/com/mh/user/mapper/MeterInfoMapper.java b/user-service/src/main/java/com/mh/user/mapper/MeterInfoMapper.java index e8edfaf..7a5c280 100644 --- a/user-service/src/main/java/com/mh/user/mapper/MeterInfoMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/MeterInfoMapper.java @@ -26,6 +26,6 @@ public interface MeterInfoMapper { @Result(property="systemId",column="system_id") }) List queryMeterInfo(@Param("systemID") String systemID, - @Param("projectID") String projectID); + @Param("projectId") String projectId); } diff --git a/user-service/src/main/java/com/mh/user/mapper/ProjectInfoMapper.java b/user-service/src/main/java/com/mh/user/mapper/ProjectInfoMapper.java index e9bc120..d443e75 100644 --- a/user-service/src/main/java/com/mh/user/mapper/ProjectInfoMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/ProjectInfoMapper.java @@ -17,11 +17,11 @@ public interface ProjectInfoMapper extends BaseMapper { @Result(property="pScale",column="p_scale"), @Result(property="pic",column="pic"), @Result(property="tel",column="tel"), - @Result(property="systemID",column="system_id"), + @Result(property="systemId",column="system_id"), @Result(property="remarks",column="remarks") }) - @Select("select * from Project_Info where system_id=#{systemID}") + @Select("select * from project_info where system_id=#{systemID}") List queryProjectInfo(@Param("systemID") String systemID ); //通过id查找对应的名称 diff --git a/user-service/src/main/java/com/mh/user/mapper/StrategyInfoMapper.java b/user-service/src/main/java/com/mh/user/mapper/StrategyInfoMapper.java index 5783e83..e98509e 100644 --- a/user-service/src/main/java/com/mh/user/mapper/StrategyInfoMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/StrategyInfoMapper.java @@ -15,10 +15,10 @@ public interface StrategyInfoMapper extends BaseMapper { "" + " and system_id = #{systemID} " + "" + - "" + - " and project_id = #{projectID} " + + "" + + " and project_id = #{projectId} " + "" + " order by id " + "") - List queryStrategyInfo(@Param("systemID") String systemID,@Param("projectID") String projectID); + List queryStrategyInfo(@Param("systemID") String systemID,@Param("projectId") String projectId); } diff --git a/user-service/src/main/java/com/mh/user/mapper/SysMenuMapper.java b/user-service/src/main/java/com/mh/user/mapper/SysMenuMapper.java index ac8803e..e1c6bef 100644 --- a/user-service/src/main/java/com/mh/user/mapper/SysMenuMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/SysMenuMapper.java @@ -26,12 +26,12 @@ public interface SysMenuMapper { List findPage(); - List findPageByName(@Param(value = "systemID") String systemID, + List findPageByName(@Param(value = "systemId") String systemID, @Param(value = "name") String name); - List findAll(@Param(value = "systemID") String systemID); + List findAll(@Param(value = "systemId") String systemID); - List findByUserName(@Param(value = "systemID") String systemID, + List findByUserName(@Param(value = "systemId") String systemID, @Param(value = "userName") String userName); List findRoleMenus(@Param(value = "roleId") Long roleId); diff --git a/user-service/src/main/java/com/mh/user/mapper/chillers/DealDataMapper.java b/user-service/src/main/java/com/mh/user/mapper/chillers/DealDataMapper.java index 0425ef7..3d272ee 100644 --- a/user-service/src/main/java/com/mh/user/mapper/chillers/DealDataMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/chillers/DealDataMapper.java @@ -26,13 +26,13 @@ public interface DealDataMapper { void proEnergyData(@Param("curDate") String curDate); // - @Select("exec pro_data_result #{curDate,jdbcType=VARCHAR,mode=IN},#{projectID,jdbcType=VARCHAR,mode=IN} ") + @Select("exec pro_data_result #{curDate,jdbcType=VARCHAR,mode=IN},#{projectId,jdbcType=VARCHAR,mode=IN} ") @Options(statementType = StatementType.CALLABLE) - void proDataResult(@Param("curDate") String curDate,@Param("projectID") String projectID); + void proDataResult(@Param("curDate") String curDate,@Param("projectId") String projectId); - @Select("exec pro_energy_day_sum #{curDate,jdbcType=VARCHAR,mode=IN},#{projectID,jdbcType=VARCHAR,mode=IN} ") + @Select("exec pro_energy_day_sum #{curDate,jdbcType=VARCHAR,mode=IN},#{projectId,jdbcType=VARCHAR,mode=IN} ") @Options(statementType = StatementType.CALLABLE) - void proEnergyDaySum(@Param("curDate") String curDate,@Param("projectID") String projectID); + void proEnergyDaySum(@Param("curDate") String curDate,@Param("projectId") String projectId); //汇总设备状态 @Select("exec pro_device_state #{curDate,jdbcType=VARCHAR,mode=IN} ") @@ -91,7 +91,7 @@ public interface DealDataMapper { int selectHourTempHumidity(@Param("curDate") String curDate); //查找项目ID - @Select("select id from Project_Info where system_id=#{systemID}") + @Select("select id from project_Info where system_id=#{systemID}") List queryProjectId(@Param("systemID") String systemID ); // @Select("test(#{name,jdbcType=VARCHAR,mode=IN},#{gender,jdbcType=VARCHAR,mode=OUT})") diff --git a/user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java b/user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java index e2de22c..512e4f5 100644 --- a/user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java +++ b/user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java @@ -2,13 +2,13 @@ package com.mh.user.mapper.provider; public class DataResultProvider { - public String queryDataResult(String projectID,String startDate,String endDate,String deviceType, int page, int limit){ + public String queryDataResult(String projectId,String startDate,String endDate,String deviceType, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from data_result " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (startDate!= null && !startDate.equals("")) { sql.append(" AND convert(varchar(10),cur_date,121)>=#{startDate} "); @@ -28,13 +28,13 @@ public class DataResultProvider { } //查询记录数 - public String getDataResultCount(String projectID,String startDate,String endDate,String deviceType, int page, int limit){ + public String getDataResultCount(String projectId,String startDate,String endDate,String deviceType, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from data_result " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (startDate!= null && !startDate.equals("")) { sql.append(" AND convert(varchar(10),cur_date,121)>=#{startDate} "); @@ -50,13 +50,13 @@ public class DataResultProvider { } //----------------------------------------------------------------------------------------------- //时间显示间隔为1分钟 - public String queryDataResultOneMi(String projectID, String startDate,String curDate, int page, int limit){ + public String queryDataResultOneMi(String projectId, String startDate,String curDate, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + " select project_id,cur_date,sum(cast(cur_value as decimal(18,2))) as cur_value from data_result_one_mi " + " where 1=1 "); - if (projectID!= null && !projectID.equals("")) { - sql.append(" AND project_id=#{projectID} "); + if (projectId!= null && !projectId.equals("")) { + sql.append(" AND project_id=#{projectId} "); } if (startDate!= null && !startDate.equals("")) { sql.append(" AND cur_date>=#{startDate} "); @@ -73,13 +73,13 @@ public class DataResultProvider { return sql.toString(); } - public String dataResultOneMiCount(String projectID, String startDate,String curDate){ + public String dataResultOneMiCount(String projectId, String startDate,String curDate){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + " select project_id,cur_date,sum(cast(cur_value as decimal(18,2))) as cur_value from data_result_one_mi " + " where 1=1 "); - if (projectID!= null && !projectID.equals("")) { - sql.append(" AND project_id=#{projectID} "); + if (projectId!= null && !projectId.equals("")) { + sql.append(" AND project_id=#{projectId} "); } if (startDate!= null && !startDate.equals("")) { sql.append(" AND cur_date>=#{startDate} "); @@ -93,13 +93,13 @@ public class DataResultProvider { //时间显示间隔为5分钟 - public String queryDataResultFiveMi(String projectID,String startDate,String curDate, int page, int limit){ + public String queryDataResultFiveMi(String projectId,String startDate,String curDate, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + " select project_id,cur_date,sum(cast(cur_value as decimal(18,2))) as cur_value from data_result_five_mi " + " where 1=1 "); - if (projectID!= null && !projectID.equals("")) { - sql.append(" AND project_id=#{projectID} "); + if (projectId!= null && !projectId.equals("")) { + sql.append(" AND project_id=#{projectId} "); } if (startDate!= null && !startDate.equals("")) { sql.append(" AND cur_date>=#{startDate} "); @@ -115,13 +115,13 @@ public class DataResultProvider { return sql.toString(); } - public String dataResultFiveMiCount(String projectID, String startDate,String curDate){ + public String dataResultFiveMiCount(String projectId, String startDate,String curDate){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + " select project_id,cur_date,sum(cast(cur_value as decimal(18,2))) as cur_value from data_result_five_mi " + " where 1=1 "); - if (projectID!= null && !projectID.equals("")) { - sql.append(" AND project_id=#{projectID} "); + if (projectId!= null && !projectId.equals("")) { + sql.append(" AND project_id=#{projectId} "); } if (startDate!= null && !startDate.equals("")) { sql.append(" AND cur_date>=#{startDate} "); @@ -134,13 +134,13 @@ public class DataResultProvider { } //时间显示间隔为15分钟 - public String queryDataResultFifteenMi(String projectID,String startDate,String curDate, int page, int limit){ + public String queryDataResultFifteenMi(String projectId,String startDate,String curDate, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + " select project_id,cur_date,sum(cast(cur_value as decimal(18,2))) as cur_value from data_result_fifteen_mi " + " where 1=1 "); - if (projectID!= null && !projectID.equals("")) { - sql.append(" AND project_id=#{projectID} "); + if (projectId!= null && !projectId.equals("")) { + sql.append(" AND project_id=#{projectId} "); } if (startDate!= null && !startDate.equals("")) { sql.append(" AND cur_date>=#{startDate} "); @@ -156,13 +156,13 @@ public class DataResultProvider { return sql.toString(); } - public String dataResultFifteenMiCount(String projectID, String startDate,String curDate){ + public String dataResultFifteenMiCount(String projectId, String startDate,String curDate){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + " select project_id,cur_date,sum(cast(cur_value as decimal(18,2))) as cur_value from data_result_five_mi " + " where 1=1 "); - if (projectID!= null && !projectID.equals("")) { - sql.append(" AND project_id=#{projectID} "); + if (projectId!= null && !projectId.equals("")) { + sql.append(" AND project_id=#{projectId} "); } if (startDate!= null && !startDate.equals("")) { sql.append(" AND cur_date>=#{startDate} "); @@ -175,12 +175,12 @@ public class DataResultProvider { } //查询冷水机参数历史数据情况 - public String queryDataResultChiller(String projectID,String deviceAddr,String registerName,String startDate,String curDate, int page, int limit){ + public String queryDataResultChiller(String projectId,String deviceAddr,String registerName,String startDate,String curDate, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (select *,ROW_NUMBER() over(order by cur_date) as rn from data_result_chiller " + " where 1=1 "); - if (projectID!= null && !projectID.equals("")) { - sql.append(" AND project_id=#{projectID} "); + if (projectId!= null && !projectId.equals("")) { + sql.append(" AND project_id=#{projectId} "); } if (deviceAddr!= null && !deviceAddr.equals("")) { sql.append(" AND device_addr=#{deviceAddr} "); @@ -203,12 +203,12 @@ public class DataResultProvider { } //查询记录数 - public String dataResultChillerCount(String projectID,String deviceAddr,String registerName,String startDate,String curDate){ + public String dataResultChillerCount(String projectId,String deviceAddr,String registerName,String startDate,String curDate){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (select *,ROW_NUMBER() over(order by cur_date) as rn from data_result_chiller " + " where 1=1 "); - if (projectID!= null && !projectID.equals("")) { - sql.append(" AND project_id=#{projectID} "); + if (projectId!= null && !projectId.equals("")) { + sql.append(" AND project_id=#{projectId} "); } if (deviceAddr!= null && !deviceAddr.equals("")) { sql.append(" AND device_addr=#{deviceAddr} "); diff --git a/user-service/src/main/java/com/mh/user/mapper/provider/DeviceInfoProvider.java b/user-service/src/main/java/com/mh/user/mapper/provider/DeviceInfoProvider.java index d7be1d5..381731b 100644 --- a/user-service/src/main/java/com/mh/user/mapper/provider/DeviceInfoProvider.java +++ b/user-service/src/main/java/com/mh/user/mapper/provider/DeviceInfoProvider.java @@ -2,7 +2,7 @@ package com.mh.user.mapper.provider; public class DeviceInfoProvider { - public String queryDeviceInfo(String systemID,String projectID,String deviceType){ + public String queryDeviceInfo(String systemID,String projectId,String deviceType){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from device_info " + @@ -10,8 +10,8 @@ public class DeviceInfoProvider { if (systemID != null && !systemID.equals("")){ sql.append(" AND system_id = #{systemID} "); } - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (deviceType != null && !deviceType.equals("")){ sql.append(" AND device_type = #{deviceType} "); diff --git a/user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java b/user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java index c29c100..880dd2c 100644 --- a/user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java +++ b/user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java @@ -3,20 +3,20 @@ package com.mh.user.mapper.provider; public class EnergyDataProvider { //按十分钟 - public String queryEnergyDataMi(String projectID,String curDate,int page, int limit){ + public String queryEnergyDataMi(String projectId,String curDate,int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_mi " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } if (curDate != null && !curDate.equals("")) { sql.append(" AND LEFT(cur_date,10)=#{curDate} "); } - if(projectID.equals("所有")){ + if(projectId.equals("所有")){ if ((page != 0) && (limit != 0)){ sql.append(" )T where T.rn>(#{page}-1)*#{limit} and T.rn<=#{page}*#{limit} order by T.cur_date "); } else if (page == 0){ @@ -34,20 +34,20 @@ public class EnergyDataProvider { } //记录数 - public String getEnergyDataMiCount(String projectID,String curDate){ + public String getEnergyDataMiCount(String projectId,String curDate){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_mi " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } if (curDate != null && !curDate.equals("")) { sql.append(" AND LEFT(cur_date,10)=#{curDate} "); } - if(projectID.equals("所有")){ + if(projectId.equals("所有")){ sql.append(" )T "); }else{ sql.append(" )T join project_info T1 ON T.project_id=T1.id "); @@ -57,21 +57,21 @@ public class EnergyDataProvider { } //按小时 - public String queryEnergyDataHour(String projectID,String curDate,int page, int limit){ + public String queryEnergyDataHour(String projectId,String curDate,int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_hour " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } if (curDate != null && !curDate.equals("")) { sql.append(" AND LEFT(cur_date,10)=#{curDate} "); } - assert projectID != null; - if(projectID.equals("所有")){ + assert projectId != null; + if(projectId.equals("所有")){ if ((page != 0) && (limit != 0)){ sql.append(" )T where T.rn>(#{page}-1)*#{limit} and T.rn<=#{page}*#{limit} order by T.cur_date "); } else if (page == 0){ @@ -89,21 +89,21 @@ public class EnergyDataProvider { } //按小时记录数 - public String getEnergyDataHourCount(String projectID,String curDate){ + public String getEnergyDataHourCount(String projectId,String curDate){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_hour " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } if (curDate != null && !curDate.equals("")) { sql.append(" AND LEFT(cur_date,10)=#{curDate} "); } - if(projectID.equals("所有")){ + if(projectId.equals("所有")){ sql.append(" )T "); }else{ sql.append(" )T join project_info T1 ON T.project_id=T1.id join hour_temperature t2 on LEFT(T.cur_date,13)=CONVERT(VARCHAR(13),t2.cur_date,121)"); @@ -114,13 +114,13 @@ public class EnergyDataProvider { } //按天 - public String queryEnergyDataDay(String projectID,String curDate,int queryType,int page, int limit){ + public String queryEnergyDataDay(String projectId,String curDate,int queryType,int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_day " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } @@ -131,7 +131,7 @@ public class EnergyDataProvider { sql.append(" AND LEFT(cur_date,10)=#{curDate} "); } } - if(projectID.equals("所有")){ + if(projectId.equals("所有")){ if ((page != 0) && (limit != 0)){ sql.append(" )T where T.rn>(#{page}-1)*#{limit} and T.rn<=#{page}*#{limit} order by T.cur_date "); } else if (page == 0){ @@ -149,13 +149,13 @@ public class EnergyDataProvider { } //记录数 - public String getEnergyDataDayCount(String projectID,String curDate,int queryType){ + public String getEnergyDataDayCount(String projectId,String curDate,int queryType){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_day " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } @@ -166,7 +166,7 @@ public class EnergyDataProvider { sql.append(" AND LEFT(cur_date,10)=#{curDate} "); } } - if(projectID.equals("所有")){ + if(projectId.equals("所有")){ sql.append(" )T "); }else{ sql.append(" )T join project_info T1 ON T.project_id=T1.id join date_temperature t2 on LEFT(T.cur_date,10)=CONVERT(VARCHAR(10),t2.cur_date,121) "); @@ -176,13 +176,13 @@ public class EnergyDataProvider { } //按月 - public String queryEnergyDataMonth(String projectID,String curDate,int queryType,int page, int limit){ + public String queryEnergyDataMonth(String projectId,String curDate,int queryType,int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_month " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } @@ -193,7 +193,7 @@ public class EnergyDataProvider { sql.append(" AND LEFT(cur_date,7)=#{curDate} "); } } - if(projectID.equals("所有")){ + if(projectId.equals("所有")){ if ((page != 0) && (limit != 0)){ sql.append(" )T where T.rn>(#{page}-1)*#{limit} and T.rn<=#{page}*#{limit} order by T.cur_date "); } else if (page == 0){ @@ -211,13 +211,13 @@ public class EnergyDataProvider { } //记录数 - public String getEnergyDataMonthCount(String projectID,String curDate,int queryType){ + public String getEnergyDataMonthCount(String projectId,String curDate,int queryType){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_month " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } @@ -228,7 +228,7 @@ public class EnergyDataProvider { sql.append(" AND LEFT(cur_date,7)=#{curDate} "); } } - if(projectID.equals("所有")){ + if(projectId.equals("所有")){ sql.append(" )T "); }else{ sql.append(" )T join project_info T1 ON T.project_id=T1.id "); @@ -237,13 +237,13 @@ public class EnergyDataProvider { return sql.toString(); } - public String queryEnergyDataYear(String projectID,String startDate,String endDate,int queryType,int page, int limit){ + public String queryEnergyDataYear(String projectId,String startDate,String endDate,int queryType,int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_year " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } @@ -259,7 +259,7 @@ public class EnergyDataProvider { sql.append(" AND LEFT(cur_date,4)=#{startDate} "); } } - if(projectID.equals("所有")){ + if(projectId.equals("所有")){ if ((page != 0) && (limit != 0)){ sql.append(" )T where T.rn>(#{page}-1)*#{limit} and T.rn<=#{page}*#{limit} order by T.cur_date "); } else if (page == 0){ @@ -277,13 +277,13 @@ public class EnergyDataProvider { } //记录数 - public String getEnergyDataYearCount(String projectID,String startDate,String endDate,int queryType){ + public String getEnergyDataYearCount(String projectId,String startDate,String endDate,int queryType){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_year " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); }else{ sql.append(" AND project_id <>'所有' "); } @@ -299,7 +299,7 @@ public class EnergyDataProvider { sql.append(" AND LEFT(cur_date,4)=#{startDate} "); } } - if(projectID.equals("所有")){ + if(projectId.equals("所有")){ sql.append(" )T "); }else{ sql.append(" )T join project_info T1 ON T.project_id=T1.id "); diff --git a/user-service/src/main/java/com/mh/user/mapper/provider/EnergyProvider.java b/user-service/src/main/java/com/mh/user/mapper/provider/EnergyProvider.java index 9cec1af..c9c4a28 100644 --- a/user-service/src/main/java/com/mh/user/mapper/provider/EnergyProvider.java +++ b/user-service/src/main/java/com/mh/user/mapper/provider/EnergyProvider.java @@ -3,13 +3,13 @@ package com.mh.user.mapper.provider; public class EnergyProvider { //小时 - public String queryEnergyHour(String projectID,String buildingId,String startDate,String endDate,int queryType, int page, int limit){ + public String queryEnergyHour(String projectId,String buildingId,String startDate,String endDate,int queryType, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_hour " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (buildingId != null && !buildingId.equals("")){ sql.append(" AND building_id = #{buildingId} "); @@ -46,13 +46,13 @@ public class EnergyProvider { } //按天 - public String queryEnergyDay(String projectID,String buildingId,String startDate,String endDate,int queryType, int page, int limit){ + public String queryEnergyDay(String projectId,String buildingId,String startDate,String endDate,int queryType, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_day " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (buildingId != null && !buildingId.equals("")){ sql.append(" AND building_id = #{buildingId} "); @@ -89,13 +89,13 @@ public class EnergyProvider { } //按月 - public String queryEnergyMonth(String projectID,String buildingId,String startDate,String endDate,int queryType, int page, int limit){ + public String queryEnergyMonth(String projectId,String buildingId,String startDate,String endDate,int queryType, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_Month " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (buildingId != null && !buildingId.equals("")){ sql.append(" AND building_id = #{buildingId} "); @@ -132,13 +132,13 @@ public class EnergyProvider { } //按年 - public String queryEnergyYear(String projectID,String buildingId,String startDate,String endDate,int queryType, int page, int limit){ + public String queryEnergyYear(String projectId,String buildingId,String startDate,String endDate,int queryType, int page, int limit){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_year " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (buildingId != null && !buildingId.equals("")){ sql.append(" AND building_id = #{buildingId} "); @@ -176,13 +176,13 @@ public class EnergyProvider { //查询记录数 //按小时 - public String getEnergyHourCount(String projectID,String buildingId,String startDate,String endDate,int queryType){ + public String getEnergyHourCount(String projectId,String buildingId,String startDate,String endDate,int queryType){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_day " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (buildingId != null && !buildingId.equals("")){ sql.append(" AND building_id = #{buildingId} "); @@ -211,13 +211,13 @@ public class EnergyProvider { } //按天 - public String getEnergyDayCount(String projectID,String buildingId,String startDate,String endDate,int queryType){ + public String getEnergyDayCount(String projectId,String buildingId,String startDate,String endDate,int queryType){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_day " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (buildingId != null && !buildingId.equals("")){ sql.append(" AND building_id = #{buildingId} "); @@ -246,13 +246,13 @@ public class EnergyProvider { } //按月 - public String getEnergyMonthCount(String projectID,String buildingId,String startDate,String endDate,int queryType){ + public String getEnergyMonthCount(String projectId,String buildingId,String startDate,String endDate,int queryType){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_month " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (buildingId != null && !buildingId.equals("")){ sql.append(" AND building_id = #{buildingId} "); @@ -281,13 +281,13 @@ public class EnergyProvider { } //按年 - public String getEnergyYearCount(String projectID,String buildingId,String startDate,String endDate,int queryType){ + public String getEnergyYearCount(String projectId,String buildingId,String startDate,String endDate,int queryType){ StringBuffer sql = new StringBuffer(""); sql.append("select count(*) from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_year " + " where 1=1 "); - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } if (buildingId != null && !buildingId.equals("")){ sql.append(" AND building_id = #{buildingId} "); diff --git a/user-service/src/main/java/com/mh/user/mapper/provider/MeterInfoProvider.java b/user-service/src/main/java/com/mh/user/mapper/provider/MeterInfoProvider.java index 1b14639..97454b0 100644 --- a/user-service/src/main/java/com/mh/user/mapper/provider/MeterInfoProvider.java +++ b/user-service/src/main/java/com/mh/user/mapper/provider/MeterInfoProvider.java @@ -2,7 +2,7 @@ package com.mh.user.mapper.provider; public class MeterInfoProvider { - public String queryMeterInfo(String systemID,String projectID){ + public String queryMeterInfo(String systemID,String projectId){ StringBuffer sql = new StringBuffer(""); sql.append("select * from (" + " select *,ROW_NUMBER() over(order by id) as rn from meter_info " + @@ -10,8 +10,8 @@ public class MeterInfoProvider { if (systemID != null && !systemID.equals("")){ sql.append(" AND system_id = #{systemID} "); } - if (projectID != null && !projectID.equals("")){ - sql.append(" AND project_id = #{projectID} "); + if (projectId != null && !projectId.equals("")){ + sql.append(" AND project_id = #{projectId} "); } sql.append(" ) T "); System.out.println(sql.toString()); diff --git a/user-service/src/main/java/com/mh/user/model/EnergyModel.java b/user-service/src/main/java/com/mh/user/model/EnergyModel.java index e00e112..39aa7d9 100644 --- a/user-service/src/main/java/com/mh/user/model/EnergyModel.java +++ b/user-service/src/main/java/com/mh/user/model/EnergyModel.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class EnergyModel { - private String projectID; + private String projectId; private String startDate; private String endDate; private int queryType; diff --git a/user-service/src/main/java/com/mh/user/model/EnergyParam.java b/user-service/src/main/java/com/mh/user/model/EnergyParam.java index 5613cb8..61a4a42 100644 --- a/user-service/src/main/java/com/mh/user/model/EnergyParam.java +++ b/user-service/src/main/java/com/mh/user/model/EnergyParam.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class EnergyParam { - private String projectID; + private String projectId; private String buildingId; private String startDate; private String endDate; diff --git a/user-service/src/main/java/com/mh/user/model/QueueParam.java b/user-service/src/main/java/com/mh/user/model/QueueParam.java index e5cf98f..42fd2e4 100644 --- a/user-service/src/main/java/com/mh/user/model/QueueParam.java +++ b/user-service/src/main/java/com/mh/user/model/QueueParam.java @@ -8,6 +8,6 @@ public class QueueParam { private String recData; private String deviceType; private String registerAddr; - private String projectID; + private String projectId; private String copyTime; } diff --git a/user-service/src/main/java/com/mh/user/model/SysMenu.java b/user-service/src/main/java/com/mh/user/model/SysMenu.java index 4a9e04e..6ad15bc 100644 --- a/user-service/src/main/java/com/mh/user/model/SysMenu.java +++ b/user-service/src/main/java/com/mh/user/model/SysMenu.java @@ -27,7 +27,7 @@ public class SysMenu extends BaseModel { private Integer orderNum; - private String systemID; + private String systemId; // 非数据库字段 private String parentTitle; // 非数据库字段 diff --git a/user-service/src/main/java/com/mh/user/model/SysUser.java b/user-service/src/main/java/com/mh/user/model/SysUser.java index 76d257f..b55c42d 100644 --- a/user-service/src/main/java/com/mh/user/model/SysUser.java +++ b/user-service/src/main/java/com/mh/user/model/SysUser.java @@ -37,7 +37,7 @@ public class SysUser extends BaseModel { private Date loginTime; - private String systemID; + private String systemId; private List userRoles = new ArrayList<>(); diff --git a/user-service/src/main/java/com/mh/user/netty/EchoServerHandler.java b/user-service/src/main/java/com/mh/user/netty/EchoServerHandler.java index 8a5a44e..9dd9b0b 100644 --- a/user-service/src/main/java/com/mh/user/netty/EchoServerHandler.java +++ b/user-service/src/main/java/com/mh/user/netty/EchoServerHandler.java @@ -56,7 +56,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { if (obj instanceof IdleStateEvent) { IdleStateEvent event = (IdleStateEvent) obj; if (IdleState.READER_IDLE.equals(event.state())) { //如果读通道处于空闲状态，说明没有接收到心跳命令 - System.out.println("第" + idleCount + "已经10秒没有接收到客户端的信息了"); + log.info("第{}已经10秒没有接收到客户端的信息了", idleCount); receiveStr =""; num = num + 1; if (num > size - 1) { @@ -115,10 +115,10 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { }else{ receiveStr = receiveStr.replace("FE", ""); } - log.info("channelReadComplete接收到的数据长度: ===> "+receiveStr.length()); + log.info("channelReadComplete接收到的数据长度: ===> {}", receiveStr.length()); //心跳包处理 if ((receiveStr.length() == 8) && receiveStr.startsWith("24")) { - log.info("接收到心跳包 ===> " + receiveStr); + log.info("接收到心跳包 ===> {}", receiveStr); idleCount = 1; port=receiveStr.substring(4,8);//心跳包包含网关端口（自己定义返回心跳包） // 清空receiveStr @@ -127,11 +127,11 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { gatewayManageService.updateGatewayManage2(port); //根据端口或者IP或者心跳包查询网关对应的项目名称 String projectName=gatewayManageService.selectProjectName(port); - log.info("---------------------"+projectName+"项目网关上线---------------------"); + log.info("---------------------{}项目网关上线---------------------", projectName); // 生成采集指令 deviceCodeParamList = deviceCodeParamService.queryCodeParam(port); //心跳包包含网关端口（自己定义返回心跳包） size = deviceCodeParamList.size(); - log.info("deviceCodeParam size ===> " + size); + log.info("deviceCodeParam size ===> {}", size); num = 0; // 发送采集报文 if (size>0) { @@ -148,7 +148,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { } else if (receiveStr.length() == 36 || receiveStr.length() == 40 || receiveStr.length() == 44 || receiveStr.length() == 50) { //电表返回数据解析 idleCount=1; - log.info("电表接收===> " + receiveStr+",长度:"+receiveStr.length()); + log.info("电表接收===> {},长度:{}", receiveStr, receiveStr.length()); //解析采集的报文，并保存到数据库 AnalysisReceiveOrder485 analysisReceiveOrder485 = new AnalysisReceiveOrder485(); analysisReceiveOrder485.analysisMeterOrder485(receiveStr,deviceCodeParamList.get(num)); @@ -161,7 +161,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { Thread.sleep(200); // 继续发送下一个采集指令 SendOrderUtils.sendAllOrder(deviceCodeParamList.get(num),ctx,num,size); - System.out.println("------一轮采集完成,继续下一轮--------"); + log.info("------一轮采集完成,继续下一轮--------"); } else { // 添加一个状态值，判断是否继续发送指令 update by ljf on 2020-08-07 if (Constant.WEB_FLAG) { @@ -191,7 +191,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { Thread.sleep(200); // 继续发送下一个采集指令 SendOrderUtils.sendAllOrder(deviceCodeParamList.get(num),ctx,num,size); - System.out.println("------一轮采集完成,继续下一轮--------"); + log.info("------一轮采集完成,继续下一轮--------"); } else { // 添加一个状态值，判断是否继续发送指令 update by ljf on 2020-08-07 if (Constant.WEB_FLAG) { @@ -208,7 +208,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { }else if (receiveStr.length() == 12 || receiveStr.length() == 14) { //冷水机返回数据解析 idleCount=1; - log.info("冷水机接收===>" + receiveStr+",长度:"+receiveStr.length()); + log.info("冷水机接收===>{},长度:{}", receiveStr, receiveStr.length()); // 解析采集的报文，并保存到数据库 AnalysisReceiveOrder485 analysisReceiveOrder485 = new AnalysisReceiveOrder485(); analysisReceiveOrder485.analysisChillerOrder485(receiveStr,deviceCodeParamList.get(num)); @@ -221,7 +221,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { Thread.sleep(200); // 继续发送下一个采集指令 SendOrderUtils.sendAllOrder(deviceCodeParamList.get(num),ctx,num,size); - System.out.println("------一轮采集完成,继续下一轮--------"); + log.info("------一轮采集完成,继续下一轮--------"); } else { // 添加一个状态值，判断是否继续发送指令 update by ljf on 2020-08-07 if (Constant.WEB_FLAG) { @@ -246,7 +246,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { Thread.sleep(200); // 继续发送下一个采集指令 SendOrderUtils.sendAllOrder(deviceCodeParamList.get(num),ctx,num,size); - System.out.println("------一轮采集完成,继续下一轮--------"); + log.info("------一轮采集完成,继续下一轮--------"); } else { // 添加一个状态值，判断是否继续发送指令 update by ljf on 2020-08-07 if (Constant.WEB_FLAG) { @@ -317,7 +317,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { SendOrderUtils.sendAllOrder2(deviceCodeParamList.get(num), ctx,port,IP,num,size); idleCount++; }else{ - System.out.println("close this channel!"); + log.info("close this channel!"); ctx.channel().close(); } }else{ @@ -351,7 +351,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { Thread.sleep(200); // 继续发送下一个采集指令 SendOrderUtils.sendAllOrder2(deviceCodeParamList.get(num), ctx,port,IP,num,size); - System.out.println("------一轮采集完成,继续下一轮--------"); + log.info("------一轮采集完成,继续下一轮--------"); } else { // 添加一个状态值，判断是否继续发送指令 update by ljf on 2020-08-07 if (Constant.WEB_FLAG) { @@ -379,7 +379,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { Thread.sleep(200); // 继续发送下一个采集指令 SendOrderUtils.sendAllOrder2(deviceCodeParamList.get(num), ctx,port,IP,num,size); - System.out.println("------一轮采集完成,继续下一轮--------"); + log.info("------一轮采集完成,继续下一轮--------"); } else { // 添加一个状态值，判断是否继续发送指令 update by ljf on 2020-08-07 if (Constant.WEB_FLAG) { @@ -409,7 +409,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { Thread.sleep(200); // 继续发送下一个采集指令 SendOrderUtils.sendAllOrder2(deviceCodeParamList.get(num), ctx,port,IP,num,size); - System.out.println("------一轮采集完成,继续下一轮--------"); + log.info("------一轮采集完成,继续下一轮--------"); } else { // 添加一个状态值，判断是否继续发送指令 update by ljf on 2020-08-07 if (Constant.WEB_FLAG) { @@ -434,7 +434,7 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { Thread.sleep(200); // 继续发送下一个采集指令 SendOrderUtils.sendAllOrder2(deviceCodeParamList.get(num), ctx,port,IP,num,size); - System.out.println("------一轮采集完成,继续下一轮--------"); + log.info("------一轮采集完成,继续下一轮--------"); } else { // 添加一个状态值，判断是否继续发送指令 update by ljf on 2020-08-07 if (Constant.WEB_FLAG) { @@ -455,8 +455,8 @@ public class EchoServerHandler extends ChannelInboundHandlerAdapter { // 异常捕捉 @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { + log.info("异常捕捉,执行ctx.close()......{}", cause.getCause()); ctx.close(); // 关闭该Channel - log.info("异常捕捉,执行ctx.close()......"); } // 客户端断开 diff --git a/user-service/src/main/java/com/mh/user/security/UserDetailsServiceImpl.java b/user-service/src/main/java/com/mh/user/security/UserDetailsServiceImpl.java index 9e07dd4..f0ebb2b 100644 --- a/user-service/src/main/java/com/mh/user/security/UserDetailsServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/security/UserDetailsServiceImpl.java @@ -32,7 +32,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { throw new UsernameNotFoundException("该用户不存在"); } // 用户权限列表，根据用户拥有的权限标识与如 @PreAuthorize("hasAuthority('sys:menu:view')") 标注的接口对比，决定是否可以调用接口 - Set permissions = sysUserService.findPermissions(user.getSystemID(),user.getUserName()); + Set permissions = sysUserService.findPermissions(user.getSystemId(),user.getUserName()); List grantedAuthorities = permissions.stream().map(GrantedAuthorityImpl::new).collect(Collectors.toList()); System.out.println("获取权限列表"+grantedAuthorities); System.out.println(user.getUserName()); diff --git a/user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive.java b/user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive.java index 32a65c9..16a5702 100644 --- a/user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive.java +++ b/user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive.java @@ -109,7 +109,7 @@ public class SerialPortSendReceive { String deviceType=deviceManageEntityList.get(i).getDeviceType(); String registerAddr=deviceManageEntityList.get(i).getRegisterAddr(); String brand=deviceManageEntityList.get(i).getBrand();//品牌 - String buildingId=deviceManageEntityList.get(i).getProjectID(); + String buildingId=deviceManageEntityList.get(i).getProjectId(); System.out.println("=========设备类型："+deviceType+",长度："+dataStr.length()); //下面是对返回数据根据不同的设备进行相关解析处理 diff --git a/user-service/src/main/java/com/mh/user/serialport/SerialPortSingle.java b/user-service/src/main/java/com/mh/user/serialport/SerialPortSingle.java index b57cfc4..6e252ee 100644 --- a/user-service/src/main/java/com/mh/user/serialport/SerialPortSingle.java +++ b/user-service/src/main/java/com/mh/user/serialport/SerialPortSingle.java @@ -88,7 +88,7 @@ public class SerialPortSingle { String deviceType=deviceCodeParamEntity.getDeviceType(); String deviceAddr=deviceCodeParamEntity.getDeviceAddr(); String brand=deviceCodeParamEntity.getBrand(); - String buildingId=deviceCodeParamEntity.getProjectID(); + String buildingId=deviceCodeParamEntity.getProjectId(); try{ if ((dataStr.length() == 70 || dataStr.length() == 44) && deviceType.equals("水表")) { analysisReceiveOrder485.analysisWtMeterOrder485(dataStr,deviceAddr,brand,buildingId); diff --git a/user-service/src/main/java/com/mh/user/service/DataResultService.java b/user-service/src/main/java/com/mh/user/service/DataResultService.java index aafc0f9..56416bd 100644 --- a/user-service/src/main/java/com/mh/user/service/DataResultService.java +++ b/user-service/src/main/java/com/mh/user/service/DataResultService.java @@ -14,14 +14,14 @@ public interface DataResultService { void updateDataResult(DataResultEntity dataResultEntity); - List queryDataResult(String projectID, + List queryDataResult(String projectId, String startDate, String endDate, String deviceType, int page, int limit); - int getDataResultCount(String projectID, + int getDataResultCount(String projectId, String startDate, String endDate, String deviceType, @@ -45,16 +45,16 @@ public interface DataResultService { void updateDataResultCh(DataResultChEntity dataResultChEntity); //查询按分钟的时间间隔 - List queryDataResultMi(String projectID,String startDate,String curDate,int page,int limit, int type); + List queryDataResultMi(String projectId,String startDate,String curDate,int page,int limit, int type); - int dataResultOneMiCount(String projectID,String startDate,String curDate); + int dataResultOneMiCount(String projectId,String startDate,String curDate); - int dataResultFiveMiCount(String projectID,String startDate,String curDate); + int dataResultFiveMiCount(String projectId,String startDate,String curDate); - int dataResultFifteenMiCount(String projectID,String startDate,String curDate); + int dataResultFifteenMiCount(String projectId,String startDate,String curDate); //查询按秒的时间间隔 - List queryDataResultSec(String projectID,String startDate,String curDate); + List queryDataResultSec(String projectId,String startDate,String curDate); //保存冷水机数据 void saveDataResultChiller(DataResultChEntity dataResultChEntity); @@ -63,11 +63,11 @@ public interface DataResultService { void saveDataResultNow(DataResultChEntity dataResultChEntity); - void deleteDataResultNow(String deviceAddr, String deviceType, String registerAddr, String projectID); + void deleteDataResultNow(String deviceAddr, String deviceType, String registerAddr, String projectId); - List selectDataResultNow(String deviceAddr, String deviceType, String projectID); + List selectDataResultNow(String deviceAddr, String deviceType, String projectId); - List queryDataResultChiller(String projectID, + List queryDataResultChiller(String projectId, String deviceAddr, String registerName, String startDate, @@ -75,7 +75,7 @@ public interface DataResultService { int page, int limit); - int dataResultChillerCount(String projectID, + int dataResultChillerCount(String projectId, String deviceAddr, String registerName, String startDate, diff --git a/user-service/src/main/java/com/mh/user/service/DeviceCodeParamService.java b/user-service/src/main/java/com/mh/user/service/DeviceCodeParamService.java index d2963f6..a83801c 100644 --- a/user-service/src/main/java/com/mh/user/service/DeviceCodeParamService.java +++ b/user-service/src/main/java/com/mh/user/service/DeviceCodeParamService.java @@ -21,7 +21,7 @@ public interface DeviceCodeParamService { List queryCodeParam3(); //查询单个参数 - DeviceCodeParamEntity queryDeviceCodeParam(String projectID, String deviceType, String deviceAddr,String registerAddr); + DeviceCodeParamEntity queryDeviceCodeParam(String projectId, String deviceType, String deviceAddr,String registerAddr); //查询记录数 int queryCount(String ProjectID); diff --git a/user-service/src/main/java/com/mh/user/service/DeviceInfoService.java b/user-service/src/main/java/com/mh/user/service/DeviceInfoService.java index d3a0bef..1bed139 100644 --- a/user-service/src/main/java/com/mh/user/service/DeviceInfoService.java +++ b/user-service/src/main/java/com/mh/user/service/DeviceInfoService.java @@ -10,12 +10,12 @@ import java.util.List; public interface DeviceInfoService { - List queryDeviceInfo(String systemID, String projectID,String deviceType); + List queryDeviceInfo(String systemID, String projectId,String deviceType); //查询冷水机设备 - List selectDevices(String projectID); + List selectDevices(String projectId); - List queryChiller(String projectID, String deviceAddr); + List queryChiller(String projectId, String deviceAddr); - ChillerModel selectChiller(String projectID,String deviceAddr); + ChillerModel selectChiller(String projectId,String deviceAddr); } diff --git a/user-service/src/main/java/com/mh/user/service/MeterInfoService.java b/user-service/src/main/java/com/mh/user/service/MeterInfoService.java index e84c21e..3ec34c9 100644 --- a/user-service/src/main/java/com/mh/user/service/MeterInfoService.java +++ b/user-service/src/main/java/com/mh/user/service/MeterInfoService.java @@ -5,5 +5,5 @@ import java.util.List; public interface MeterInfoService { - List queryMeterInfo(String systemID,String projectID); + List queryMeterInfo(String systemID,String projectId); } diff --git a/user-service/src/main/java/com/mh/user/service/StrategyInfoService.java b/user-service/src/main/java/com/mh/user/service/StrategyInfoService.java index f5b64bb..0a571fc 100644 --- a/user-service/src/main/java/com/mh/user/service/StrategyInfoService.java +++ b/user-service/src/main/java/com/mh/user/service/StrategyInfoService.java @@ -5,5 +5,5 @@ import com.mh.user.entity.StrategyInfoEntity; import java.util.List; public interface StrategyInfoService { - List queryStrategyInfo(String systemID, String projectID); + List queryStrategyInfo(String systemID, String projectId); } diff --git a/user-service/src/main/java/com/mh/user/service/chillers/DealDataService.java b/user-service/src/main/java/com/mh/user/service/chillers/DealDataService.java index 49e6e10..17740ba 100644 --- a/user-service/src/main/java/com/mh/user/service/chillers/DealDataService.java +++ b/user-service/src/main/java/com/mh/user/service/chillers/DealDataService.java @@ -20,9 +20,9 @@ public interface DealDataService { void proEnergyData(String curDate); - void proDataResult(String curDate,String projectID); + void proDataResult(String curDate,String projectId); - void proEnergyDaySum(String curDate,String projectID); + void proEnergyDaySum(String curDate,String projectId); void proDeviceState(String curDate); diff --git a/user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java b/user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java index bf7c9d9..9df302f 100644 --- a/user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java @@ -37,14 +37,14 @@ public class DealDataServiceImpl implements DealDataService { } @Override - public void proDataResult(String curDate,String projectID) { + public void proDataResult(String curDate,String projectId) { - dealDataMapper.proDataResult(curDate,projectID); + dealDataMapper.proDataResult(curDate,projectId); } @Override - public void proEnergyDaySum(String curDate, String projectID) { - dealDataMapper.proEnergyDaySum(curDate,projectID); + public void proEnergyDaySum(String curDate, String projectId) { + dealDataMapper.proEnergyDaySum(curDate,projectId); } @Override diff --git a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java index a6a3b95..e188dd0 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java @@ -69,7 +69,7 @@ public class DataResultServiceImpl implements DataResultService { dataResultEntity.setCurDate(date); } //从安装表获取设备信息 - DeviceInstallEntity deviceInstallEntity = deviceInstallMapper.selectDevice(dataResultEntity.getDeviceAddr(), dataResultEntity.getDeviceType(), dataResultEntity.getProjectID()); + DeviceInstallEntity deviceInstallEntity = deviceInstallMapper.selectDevice(dataResultEntity.getDeviceAddr(), dataResultEntity.getDeviceType(), dataResultEntity.getProjectId()); //判断是否有记录 // int r = dataResultMapper.selectDataResultCount(sdf1.format(dataResultEntity.getCurDate()), // dataResultEntity.getDeviceAddr(),dataResultEntity.getDeviceType()); @@ -86,7 +86,7 @@ public class DataResultServiceImpl implements DataResultService { String curDate = sdf1.format(dataResultEntity.getCurDate()); data.setCurDate(sdf1.parse(curDate));//当前日期 data.setCurValue(dataResultEntity.getCurValue()); //当前读数 - data.setProjectID(deviceInstallEntity.getProjectID()); //楼栋编号 + data.setProjectId(deviceInstallEntity.getProjectId()); //楼栋编号 data.setRatio(deviceInstallEntity.getRatio()); //倍率 BigDecimal lastValue = deviceInstallEntity.getLastValue(); //安装基表上次读数 BigDecimal calcValue = dataResultEntity.getCurValue().subtract(lastValue); //计算用量 @@ -126,13 +126,13 @@ public class DataResultServiceImpl implements DataResultService { } @Override - public List queryDataResult(String projectID, String startDate, String endDate, String deviceType, int page, int limit) { - return dataResultMapper.queryDataResult(projectID, startDate, endDate, deviceType, page, limit); + public List queryDataResult(String projectId, String startDate, String endDate, String deviceType, int page, int limit) { + return dataResultMapper.queryDataResult(projectId, startDate, endDate, deviceType, page, limit); } @Override - public int getDataResultCount(String projectID, String startDate, String endDate, String deviceType, int page, int limit) { - return dataResultMapper.getDataResultCount(projectID, startDate, endDate, deviceType, page, limit); + public int getDataResultCount(String projectId, String startDate, String endDate, String deviceType, int page, int limit) { + return dataResultMapper.getDataResultCount(projectId, startDate, endDate, deviceType, page, limit); } //------------------------------------------------------------------------------------- @@ -147,6 +147,9 @@ public class DataResultServiceImpl implements DataResultService { } //从安装表获取设备信息 DeviceInstallEntity deviceInstallEntity = deviceInstallMapper.selectDevice(dataResultClEntity.getDeviceAddr(), dataResultClEntity.getDeviceType(), dataResultClEntity.getProjectId()); + if (null == deviceInstallEntity) { + return; + } BigDecimal lastValue = deviceInstallEntity.getLastValue(); BigDecimal curValue = dataResultClEntity.getCurValue(); dataResultClEntity.setRatio(deviceInstallEntity.getRatio()); //倍率 @@ -177,8 +180,8 @@ public class DataResultServiceImpl implements DataResultService { String curDate = DateUtil.dateToString(dataResultClEntity.getCurDate(), "yyyy-MM-dd HH:mm:ss"); String deviceAddr = deviceInstallEntity.getDeviceAddr(); String registerAddr = dataResultClEntity.getRegisterAddr(); - String projectID = dataResultClEntity.getProjectId(); - int row = dataResultClBakMapper.selectDataResultChBakCount(curDate, deviceAddr, registerAddr, projectID);//无记录 + String projectId = dataResultClEntity.getProjectId(); + int row = dataResultClBakMapper.selectDataResultChBakCount(curDate, deviceAddr, registerAddr, projectId);//无记录 if (row == 0) { dataResultClBakMapper.saveDataResultCl_bak(dataResultClEntity); //插入新的记录 } @@ -201,8 +204,8 @@ public class DataResultServiceImpl implements DataResultService { String deviceAddr = dataResultChEntity.getDeviceAddr(); String registerAddr = dataResultChEntity.getRegisterAddr(); String curDate = DateUtil.dateToString(dataResultChEntity.getCurDate(), "yyyy-MM-dd HH:mm:ss"); - String projectID = dataResultChEntity.getProjectId(); - int row = dataResultChMapper.selectDataResultChCount(curDate, deviceAddr, registerAddr, projectID, dataResultChEntity.getGrade());//无记录 + String projectId = dataResultChEntity.getProjectId(); + int row = dataResultChMapper.selectDataResultChCount(curDate, deviceAddr, registerAddr, projectId, dataResultChEntity.getGrade());//无记录 if (row == 0) { dataResultChMapper.saveDataResultCh(dataResultChEntity); //插入新的记录 } @@ -218,36 +221,36 @@ public class DataResultServiceImpl implements DataResultService { } @Override - public List queryDataResultMi(String projectID, String startDate, String curDate, int page, int limit, int type) { + public List queryDataResultMi(String projectId, String startDate, String curDate, int page, int limit, int type) { if (type == 0) { - return dataResultOneMiMapper.queryDataResultOneMi(projectID, startDate, curDate, page, limit); + return dataResultOneMiMapper.queryDataResultOneMi(projectId, startDate, curDate, page, limit); } else if (type == 1) { - return dataResultFiveMiMapper.queryDataResultFiveMi(projectID, startDate, curDate, page, limit); + return dataResultFiveMiMapper.queryDataResultFiveMi(projectId, startDate, curDate, page, limit); } else if (type == 2) { - return dataResultFifteenMiMapper.queryDataResultFifteenMi(projectID, startDate, curDate, page, limit); + return dataResultFifteenMiMapper.queryDataResultFifteenMi(projectId, startDate, curDate, page, limit); } else { - return dataResultOneMiMapper.queryDataResultOneMi(projectID, startDate, curDate, page, limit); + return dataResultOneMiMapper.queryDataResultOneMi(projectId, startDate, curDate, page, limit); } } @Override - public int dataResultOneMiCount(String projectID, String startDate, String curDate) { - return dataResultOneMiMapper.dataResultOneMiCount(projectID, startDate, curDate); + public int dataResultOneMiCount(String projectId, String startDate, String curDate) { + return dataResultOneMiMapper.dataResultOneMiCount(projectId, startDate, curDate); } @Override - public int dataResultFiveMiCount(String projectID, String startDate, String curDate) { - return dataResultFiveMiMapper.dataResultFiveMiCount(projectID, startDate, curDate); + public int dataResultFiveMiCount(String projectId, String startDate, String curDate) { + return dataResultFiveMiMapper.dataResultFiveMiCount(projectId, startDate, curDate); } @Override - public int dataResultFifteenMiCount(String projectID, String startDate, String curDate) { - return dataResultFifteenMiMapper.dataResultFifteenMiCount(projectID, startDate, curDate); + public int dataResultFifteenMiCount(String projectId, String startDate, String curDate) { + return dataResultFifteenMiMapper.dataResultFifteenMiCount(projectId, startDate, curDate); } @Override - public List queryDataResultSec(String projectID, String startDate, String curDate) { - return dataResultChMapper.queryDataResultCh(projectID, startDate, curDate); + public List queryDataResultSec(String projectId, String startDate, String curDate) { + return dataResultChMapper.queryDataResultCh(projectId, startDate, curDate); } @Override @@ -268,9 +271,9 @@ public class DataResultServiceImpl implements DataResultService { String curDate = ""; curDate = str.substring(0, 16) + ":00"; - String projectID = dataResultChEntity.getProjectId(); + String projectId = dataResultChEntity.getProjectId(); dataResultChEntity.setCurDate(sdf1.parse(curDate)); - int row = dataResultChillerMapper.selectDataResultChillerCount(curDate, deviceAddr, registerAddr, projectID, dataResultChEntity.getFunCode());//无记录 + int row = dataResultChillerMapper.selectDataResultChillerCount(curDate, deviceAddr, registerAddr, projectId, dataResultChEntity.getFunCode());//无记录 if (row == 0) { dataResultChillerMapper.saveDataResultChiller(dataResultChEntity); //插入新的记录 } else { @@ -291,28 +294,28 @@ public class DataResultServiceImpl implements DataResultService { String deviceAddr = dataResultChEntity.getDeviceAddr(); String registerAddr = dataResultChEntity.getRegisterAddr(); String deviceType = dataResultChEntity.getDeviceType(); - String projectID = dataResultChEntity.getProjectId(); - dataResultNowMapper.deleteDataResultNow(deviceAddr, deviceType, registerAddr, projectID); + String projectId = dataResultChEntity.getProjectId(); + dataResultNowMapper.deleteDataResultNow(deviceAddr, deviceType, registerAddr, projectId); dataResultNowMapper.saveDataResultNow(dataResultChEntity); } @Override - public void deleteDataResultNow(String deviceAddr, String deviceType, String registerAddr, String projectID) { - dataResultNowMapper.deleteDataResultNow(deviceAddr, deviceType, registerAddr, projectID); + public void deleteDataResultNow(String deviceAddr, String deviceType, String registerAddr, String projectId) { + dataResultNowMapper.deleteDataResultNow(deviceAddr, deviceType, registerAddr, projectId); } @Override - public List selectDataResultNow(String deviceAddr, String deviceType, String projectID) { - return dataResultNowMapper.selectDataResultNow(deviceAddr, deviceType, projectID); + public List selectDataResultNow(String deviceAddr, String deviceType, String projectId) { + return dataResultNowMapper.selectDataResultNow(deviceAddr, deviceType, projectId); } @Override - public List queryDataResultChiller(String projectID, String deviceAddr, String registerName, String startDate, String curDate, int page, int limit) { - return dataResultChillerMapper.queryDataResultChiller(projectID, deviceAddr, registerName, startDate, curDate, page, limit); + public List queryDataResultChiller(String projectId, String deviceAddr, String registerName, String startDate, String curDate, int page, int limit) { + return dataResultChillerMapper.queryDataResultChiller(projectId, deviceAddr, registerName, startDate, curDate, page, limit); } @Override - public int dataResultChillerCount(String projectID, String deviceAddr, String registerName, String startDate, String curDate) { - return dataResultChillerMapper.dataResultChillerCount(projectID, deviceAddr, registerName, startDate, curDate); + public int dataResultChillerCount(String projectId, String deviceAddr, String registerName, String startDate, String curDate) { + return dataResultChillerMapper.dataResultChillerCount(projectId, deviceAddr, registerName, startDate, curDate); } } diff --git a/user-service/src/main/java/com/mh/user/service/impl/DeviceCodeParamServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DeviceCodeParamServiceImpl.java index 738d8f5..f871417 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DeviceCodeParamServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DeviceCodeParamServiceImpl.java @@ -38,8 +38,8 @@ public class DeviceCodeParamServiceImpl implements DeviceCodeParamService { } @Override - public DeviceCodeParamEntity queryDeviceCodeParam(String projectID, String deviceType, String deviceAddr,String registerAddr) { - return deviceCodeParamMapper.queryDeviceCodeParam(projectID,deviceType,deviceAddr,registerAddr); + public DeviceCodeParamEntity queryDeviceCodeParam(String projectId, String deviceType, String deviceAddr,String registerAddr) { + return deviceCodeParamMapper.queryDeviceCodeParam(projectId,deviceType,deviceAddr,registerAddr); } @Override diff --git a/user-service/src/main/java/com/mh/user/service/impl/DeviceInfoServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DeviceInfoServiceImpl.java index 05fb6a4..b4bd6f4 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DeviceInfoServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DeviceInfoServiceImpl.java @@ -21,22 +21,22 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { DeviceCodeMapper deviceCodeMapper; @Override - public List queryDeviceInfo(String systemID, String projectID,String deviceType) { - return deviceInfoMapper.queryDeviceInfo(systemID,projectID,deviceType); + public List queryDeviceInfo(String systemID, String projectId,String deviceType) { + return deviceInfoMapper.queryDeviceInfo(systemID,projectId,deviceType); } @Override - public List selectDevices(String projectID) { - return deviceCodeMapper.selectDevices(projectID); + public List selectDevices(String projectId) { + return deviceCodeMapper.selectDevices(projectId); } @Override - public List queryChiller(String projectID, String deviceAddr) { - return deviceCodeMapper.queryChiller(projectID, deviceAddr); + public List queryChiller(String projectId, String deviceAddr) { + return deviceCodeMapper.queryChiller(projectId, deviceAddr); } @Override - public ChillerModel selectChiller(String projectID, String deviceAddr) { - return deviceInfoMapper.selectChiller(projectID, deviceAddr); + public ChillerModel selectChiller(String projectId, String deviceAddr) { + return deviceInfoMapper.selectChiller(projectId, deviceAddr); } } diff --git a/user-service/src/main/java/com/mh/user/service/impl/EnergyDataServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/EnergyDataServiceImpl.java index d3ba164..174a567 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/EnergyDataServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/EnergyDataServiceImpl.java @@ -17,7 +17,7 @@ public class EnergyDataServiceImpl implements EnergyDataService { @Override public List queryEnergyData(EnergyModel energyModel) { - String projectID=energyModel.getProjectID(); + String projectId=energyModel.getProjectId(); String startDate=energyModel.getStartDate(); String endDate=energyModel.getEndDate(); int page=energyModel.getPage(); @@ -26,40 +26,40 @@ public class EnergyDataServiceImpl implements EnergyDataService { int queryType=energyModel.getQueryType(); if (type==1){ //按十分钟 - return energyDataMapper.queryEnergyDataMi(projectID,startDate,page,limit); + return energyDataMapper.queryEnergyDataMi(projectId,startDate,page,limit); }else if(type==2){ //按小时 - return energyDataMapper.queryEnergyDataHour(projectID,startDate,page,limit); + return energyDataMapper.queryEnergyDataHour(projectId,startDate,page,limit); }else if(type==3){ //按天 - return energyDataMapper.queryEnergyDataDay(projectID,startDate,queryType,page,limit); + return energyDataMapper.queryEnergyDataDay(projectId,startDate,queryType,page,limit); }else if(type==4){ //按月 - return energyDataMapper.queryEnergyDataMonth(projectID,startDate,queryType,page,limit); + return energyDataMapper.queryEnergyDataMonth(projectId,startDate,queryType,page,limit); }else if(type==5){ //按年 - return energyDataMapper.queryEnergyDataYear(projectID,startDate,endDate,queryType,page,limit); + return energyDataMapper.queryEnergyDataYear(projectId,startDate,endDate,queryType,page,limit); }else{ //按天，默认 - return energyDataMapper.queryEnergyDataDay(projectID,startDate,queryType,page,limit); + return energyDataMapper.queryEnergyDataDay(projectId,startDate,queryType,page,limit); } } @Override public int getEnergyDataCount(EnergyModel energyModel) { - String projectID=energyModel.getProjectID(); + String projectId=energyModel.getProjectId(); String startDate=energyModel.getStartDate(); String endDate=energyModel.getEndDate(); int type=energyModel.getType(); int queryType=energyModel.getQueryType(); if (type==1){ //按十分钟 - return energyDataMapper.getEnergyDataMiCount(projectID,startDate); + return energyDataMapper.getEnergyDataMiCount(projectId,startDate); }else if(type==2) { //按小时 - return energyDataMapper.getEnergyDataHourCount(projectID,startDate); + return energyDataMapper.getEnergyDataHourCount(projectId,startDate); }else if(type==3) { //按天 - return energyDataMapper.getEnergyDataDayCount(projectID,startDate,queryType); + return energyDataMapper.getEnergyDataDayCount(projectId,startDate,queryType); }else if(type==4) { //按月 - return energyDataMapper.getEnergyDataMonthCount(projectID,startDate,queryType); + return energyDataMapper.getEnergyDataMonthCount(projectId,startDate,queryType); }else if(type==5) { //按年 - return energyDataMapper.getEnergyDataYearCount(projectID,startDate,endDate,queryType); + return energyDataMapper.getEnergyDataYearCount(projectId,startDate,endDate,queryType); }else { //按天，默认 - return energyDataMapper.getEnergyDataDayCount(projectID,startDate,queryType); + return energyDataMapper.getEnergyDataDayCount(projectId,startDate,queryType); } } diff --git a/user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java index 1e2d826..57b658f 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java @@ -53,7 +53,7 @@ public class EnergyServiceImpl implements EnergyService { @Override public List queryEnergy(EnergyParam energyParam) { - String projectID=energyParam.getProjectID(); + String projectId=energyParam.getProjectId(); String buildingId=energyParam.getBuildingId();//所有 String startDate=energyParam.getStartDate(); String endDate=energyParam.getEndDate(); @@ -64,20 +64,20 @@ public class EnergyServiceImpl implements EnergyService { List list=new ArrayList(); if(type==1) { -// list=energyMapper.queryEnergyHour(projectID,buildingId,startDate,queryType,page,limit); +// list=energyMapper.queryEnergyHour(projectId,buildingId,startDate,queryType,page,limit); }else if (type==2){ - list=energyMapper.queryEnergyDay(projectID,buildingId,startDate,endDate,queryType,page,limit); + list=energyMapper.queryEnergyDay(projectId,buildingId,startDate,endDate,queryType,page,limit); }else if (type==3){ - list=energyMapper.queryEnergyMonth(projectID,buildingId,startDate,endDate,queryType,page,limit); + list=energyMapper.queryEnergyMonth(projectId,buildingId,startDate,endDate,queryType,page,limit); }else if (type==4){ - list=energyMapper.queryEnergyYear(projectID,buildingId,startDate,endDate,queryType,page,limit); + list=energyMapper.queryEnergyYear(projectId,buildingId,startDate,endDate,queryType,page,limit); } return list; } @Override public int getEnergyCount(EnergyParam energyParam) { - String projectID=energyParam.getProjectID(); + String projectId=energyParam.getProjectId(); String buildingId=energyParam.getBuildingId(); String startDate=energyParam.getStartDate(); String endDate=energyParam.getEndDate(); @@ -86,13 +86,13 @@ public class EnergyServiceImpl implements EnergyService { int r=0; // 记录数 if(type==1) { - r=energyMapper.getEnergyDayCount(projectID,buildingId,startDate,endDate,queryType); + r=energyMapper.getEnergyDayCount(projectId,buildingId,startDate,endDate,queryType); }else if (type==2){ - r=energyMapper.getEnergyDayCount(projectID,buildingId,startDate,endDate,queryType); + r=energyMapper.getEnergyDayCount(projectId,buildingId,startDate,endDate,queryType); }else if (type==3){ - r=energyMapper.getEnergyMonthCount(projectID,buildingId,startDate,endDate,queryType); + r=energyMapper.getEnergyMonthCount(projectId,buildingId,startDate,endDate,queryType); }else if (type==4){ - r=energyMapper.getEnergyYearCount(projectID,buildingId,startDate,endDate,queryType); + r=energyMapper.getEnergyYearCount(projectId,buildingId,startDate,endDate,queryType); } return r; } diff --git a/user-service/src/main/java/com/mh/user/service/impl/MeterInfoServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/MeterInfoServiceImpl.java index bc26d99..414877a 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/MeterInfoServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/MeterInfoServiceImpl.java @@ -15,7 +15,7 @@ public class MeterInfoServiceImpl implements MeterInfoService { MeterInfoMapper meterInfoMapper; @Override - public List queryMeterInfo(String systemID, String projectID) { - return meterInfoMapper.queryMeterInfo(systemID,projectID); + public List queryMeterInfo(String systemID, String projectId) { + return meterInfoMapper.queryMeterInfo(systemID,projectId); } } diff --git a/user-service/src/main/java/com/mh/user/service/impl/StrategyInfoServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/StrategyInfoServiceImpl.java index 814e987..2521dc0 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/StrategyInfoServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/StrategyInfoServiceImpl.java @@ -15,7 +15,7 @@ public class StrategyInfoServiceImpl implements StrategyInfoService { StrategyInfoMapper strategyInfoMapper; @Override - public List queryStrategyInfo(String systemID, String projectID) { - return strategyInfoMapper.queryStrategyInfo(systemID,projectID); + public List queryStrategyInfo(String systemID, String projectId) { + return strategyInfoMapper.queryStrategyInfo(systemID,projectId); } } diff --git a/user-service/src/main/java/com/mh/user/sqlmapper/SysMenuMapper.xml b/user-service/src/main/java/com/mh/user/sqlmapper/SysMenuMapper.xml index eef01c4..f038930 100644 --- a/user-service/src/main/java/com/mh/user/sqlmapper/SysMenuMapper.xml +++ b/user-service/src/main/java/com/mh/user/sqlmapper/SysMenuMapper.xml @@ -15,7 +15,7 @@ - + id, parent_id, title,menu_name, component, path, menu_type, icon, order_num, create_by, create_time, @@ -189,7 +189,7 @@ select m.* from sys_menu m, sys_user u, sys_user_role ur, sys_role_menu rm where u.user_name = #{userName,jdbcType=BIGINT} and u.id = ur.user_id - and ur.role_id = rm.role_id and rm.menu_id = m.id and m.system_id=#{systemID,jdbcType=BIGINT} + and ur.role_id = rm.role_id and rm.menu_id = m.id and m.system_id=#{systemId,jdbcType=BIGINT}