lijianfu
/
mh_esi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1、优化代码；

pro_v1
mh 1 year ago
parent
3b87a5b40d
commit
c27e778d60
74 changed files with 487 additions and 477 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      user-service/src/main/java/com/mh/user/component/ReceiveHandler.java
  2. 58
      user-service/src/main/java/com/mh/user/controller/DataResultController.java
  3. 20
      user-service/src/main/java/com/mh/user/controller/DeviceInfoController.java
  4. 4
      user-service/src/main/java/com/mh/user/controller/EnergyDataController.java
  5. 6
      user-service/src/main/java/com/mh/user/controller/MeterInfoController.java
  6. 2
      user-service/src/main/java/com/mh/user/controller/ProjectInfoController.java
  7. 4
      user-service/src/main/java/com/mh/user/controller/SerialPortController.java
  8. 6
      user-service/src/main/java/com/mh/user/controller/StrategyInfoController.java
  9. 8
      user-service/src/main/java/com/mh/user/controller/SysMenuController.java
  10. 4
      user-service/src/main/java/com/mh/user/controller/SysUserController.java
  11. 2
      user-service/src/main/java/com/mh/user/controller/TestController.java
  12. 2
      user-service/src/main/java/com/mh/user/entity/DataResultEntity.java
  13. 2
      user-service/src/main/java/com/mh/user/entity/DeviceCodeParamEntity.java
  14. 2
      user-service/src/main/java/com/mh/user/entity/DeviceInstallEntity.java
  15. 2
      user-service/src/main/java/com/mh/user/entity/EnergyEntity.java
  16. 2
      user-service/src/main/java/com/mh/user/entity/EnergySumEntity.java
  17. 2
      user-service/src/main/java/com/mh/user/entity/ProjectInfoEntity.java
  18. 8
      user-service/src/main/java/com/mh/user/job/DealDataJob.java
  19. 12
      user-service/src/main/java/com/mh/user/mapper/DataResultChMapper.java
  20. 32
      user-service/src/main/java/com/mh/user/mapper/DataResultChillerMapper.java
  21. 4
      user-service/src/main/java/com/mh/user/mapper/DataResultClBakMapper.java
  22. 6
      user-service/src/main/java/com/mh/user/mapper/DataResultClMapper.java
  23. 6
      user-service/src/main/java/com/mh/user/mapper/DataResultFifteenMiMapper.java
  24. 6
      user-service/src/main/java/com/mh/user/mapper/DataResultFiveMiMapper.java
  25. 10
      user-service/src/main/java/com/mh/user/mapper/DataResultMapper.java
  26. 12
      user-service/src/main/java/com/mh/user/mapper/DataResultNowMapper.java
  27. 22
      user-service/src/main/java/com/mh/user/mapper/DataResultOneMiMapper.java
  28. 36
      user-service/src/main/java/com/mh/user/mapper/DeviceCodeMapper.java
  29. 12
      user-service/src/main/java/com/mh/user/mapper/DeviceCodeParamMapper.java
  30. 34
      user-service/src/main/java/com/mh/user/mapper/DeviceInfoMapper.java
  31. 45
      user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java
  32. 22
      user-service/src/main/java/com/mh/user/mapper/EnergyDataMapper.java
  33. 18
      user-service/src/main/java/com/mh/user/mapper/EnergyMapper.java
  34. 2
      user-service/src/main/java/com/mh/user/mapper/MeterInfoMapper.java
  35. 4
      user-service/src/main/java/com/mh/user/mapper/ProjectInfoMapper.java
  36. 6
      user-service/src/main/java/com/mh/user/mapper/StrategyInfoMapper.java
  37. 6
      user-service/src/main/java/com/mh/user/mapper/SysMenuMapper.java
  38. 10
      user-service/src/main/java/com/mh/user/mapper/chillers/DealDataMapper.java
  39. 60
      user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java
  40. 6
      user-service/src/main/java/com/mh/user/mapper/provider/DeviceInfoProvider.java
  41. 82
      user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java
  42. 48
      user-service/src/main/java/com/mh/user/mapper/provider/EnergyProvider.java
  43. 6
      user-service/src/main/java/com/mh/user/mapper/provider/MeterInfoProvider.java
  44. 2
      user-service/src/main/java/com/mh/user/model/EnergyModel.java
  45. 2
      user-service/src/main/java/com/mh/user/model/EnergyParam.java
  46. 2
      user-service/src/main/java/com/mh/user/model/QueueParam.java
  47. 2
      user-service/src/main/java/com/mh/user/model/SysMenu.java
  48. 2
      user-service/src/main/java/com/mh/user/model/SysUser.java
  49. 34
      user-service/src/main/java/com/mh/user/netty/EchoServerHandler.java
  50. 2
      user-service/src/main/java/com/mh/user/security/UserDetailsServiceImpl.java
  51. 2
      user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive.java
  52. 2
      user-service/src/main/java/com/mh/user/serialport/SerialPortSingle.java
  53. 22
      user-service/src/main/java/com/mh/user/service/DataResultService.java
  54. 2
      user-service/src/main/java/com/mh/user/service/DeviceCodeParamService.java
  55. 8
      user-service/src/main/java/com/mh/user/service/DeviceInfoService.java
  56. 2
      user-service/src/main/java/com/mh/user/service/MeterInfoService.java
  57. 2
      user-service/src/main/java/com/mh/user/service/StrategyInfoService.java
  58. 4
      user-service/src/main/java/com/mh/user/service/chillers/DealDataService.java
  59. 8
      user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java
  60. 73
      user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java
  61. 4
      user-service/src/main/java/com/mh/user/service/impl/DeviceCodeParamServiceImpl.java
  62. 16
      user-service/src/main/java/com/mh/user/service/impl/DeviceInfoServiceImpl.java
  63. 28
      user-service/src/main/java/com/mh/user/service/impl/EnergyDataServiceImpl.java
  64. 20
      user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java
  65. 4
      user-service/src/main/java/com/mh/user/service/impl/MeterInfoServiceImpl.java
  66. 4
      user-service/src/main/java/com/mh/user/service/impl/StrategyInfoServiceImpl.java
  67. 6
      user-service/src/main/java/com/mh/user/sqlmapper/SysMenuMapper.xml
  68. 46
      user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java
  69. 2
      user-service/src/main/java/com/mh/user/utils/GetReadOrder485.java
  70. 2
      user-service/src/main/java/com/mh/user/utils/Test.java
  71. 7
      user-service/src/main/resources/application-prod.yml
  72. 5
      user-service/src/main/resources/application-test.yml
  73. 4
      user-service/src/test/java/com/mh/user/ReportTest1.java
  74. 2
      user-service/src/test/java/com/mh/user/chart/ChartTest.java

2
user-service/src/main/java/com/mh/user/component/ReceiveHandler.java
Unescape View File

@ -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");

58
user-service/src/main/java/com/mh/user/controller/DataResultController.java
Unescape View File

@ -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<DataResultEntity> records=dataResultService.queryDataResult(projectID,startDate,endDate,deviceType,page,limit);
int count=dataResultService.getDataResultCount(projectId,startDate,endDate,deviceType,page,limit);
List<DataResultEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,0);
int count=dataResultService.dataResultOneMiCount(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,0);
int count=dataResultService.dataResultOneMiCount(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,1);
int count=dataResultService.dataResultFiveMiCount(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,1);
int count=dataResultService.dataResultFiveMiCount(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,2);
int count=dataResultService.dataResultFifteenMiCount(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultMi(projectID,startDate,curDate,page,limit,0);
int count=dataResultService.dataResultOneMiCount(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultSec(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultSec(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultSec(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultSec(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultSec(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> records=dataResultService.queryDataResultSec(projectID,startDate,curDate);
List<DataResultChEntity> 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<DataResultChEntity> dataNow=dataResultService.selectDataResultNow(deviceAddr, deviceType, projectID);
List<DataResultChEntity> 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<DataResultChEntity> dataChiller=dataResultService.queryDataResultChiller(projectID,deviceAddr,registerName,startDate,curDate,page,limit);
int count=dataResultService.dataResultChillerCount(projectId,deviceAddr, registerName, startDate, curDate);
List<DataResultChEntity> dataChiller=dataResultService.queryDataResultChiller(projectId,deviceAddr,registerName,startDate,curDate,page,limit);
return HttpResult.ok(count,dataChiller);
}
}

20
user-service/src/main/java/com/mh/user/controller/DeviceInfoController.java
Unescape View File

@ -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<DeviceInfoEntity> list=deviceInfoService.queryDeviceInfo(systemID,projectID,deviceType);
List<DeviceInfoEntity> 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<DeviceModel> list=deviceInfoService.selectDevices(projectID);
public HttpResult selectDevices(@RequestParam(value = "systemId") String systemID,
@RequestParam(value = "projectId") String projectId){
List<DeviceModel> 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<ChillerModel> list=deviceInfoService.queryChiller(projectID,deviceAddr);
List<ChillerModel> 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);
}
}

4
user-service/src/main/java/com/mh/user/controller/EnergyDataController.java
Unescape View File

@ -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<EnergyDataEntity> list=energyDataService.queryEnergyData(energyModel);
int count=energyDataService.getEnergyDataCount(energyModel);
return HttpResult.ok(count,list);

6
user-service/src/main/java/com/mh/user/controller/MeterInfoController.java
Unescape View File

@ -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<MeterInfoEntity> list=meterInfoService.queryMeterInfo(systemID,projectID);
List<MeterInfoEntity> list=meterInfoService.queryMeterInfo(systemID,projectId);
return HttpResult.ok(list);
}
}

2
user-service/src/main/java/com/mh/user/controller/ProjectInfoController.java
Unescape View File

@ -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<ProjectInfoEntity> list=projectInfoService.queryProjectInfo(systemID);
return HttpResult.ok(list);

4
user-service/src/main/java/com/mh/user/controller/SerialPortController.java
Unescape View File

@ -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("温度设定")){

6
user-service/src/main/java/com/mh/user/controller/StrategyInfoController.java
Unescape View File

@ -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<StrategyInfoEntity> list=strategyInfoService.queryStrategyInfo(systemID,projectID);
public HttpResult queryStrategyInfo(@RequestParam(value = "systemId",required = false) String systemID,
@RequestParam(value = "projectId",required = false) String projectId){
List<StrategyInfoEntity> list=strategyInfoService.queryStrategyInfo(systemID,projectId);
return HttpResult.ok(list);
}
}

8
user-service/src/main/java/com/mh/user/controller/SysMenuController.java
Unescape View File

@ -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));
}
}

4
user-service/src/main/java/com/mh/user/controller/SysUserController.java
Unescape View File

@ -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")

2
user-service/src/main/java/com/mh/user/controller/TestController.java
Unescape View File

@ -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","","");

2
user-service/src/main/java/com/mh/user/entity/DataResultEntity.java
Unescape View File

@ -28,5 +28,5 @@ public class DataResultEntity {
private int grade;
private String havedUpdate;
private String projectName;
private String projectID;
private String projectId;
}

2
user-service/src/main/java/com/mh/user/entity/DeviceCodeParamEntity.java
Unescape View File

@ -29,6 +29,6 @@ public class DeviceCodeParamEntity {
private int grade; //级别
private String dataValue; //传入值
private Date createTime;
private String projectID;
private String projectId;
}

2
user-service/src/main/java/com/mh/user/entity/DeviceInstallEntity.java
Unescape View File

@ -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;

2
user-service/src/main/java/com/mh/user/entity/EnergyEntity.java
Unescape View File

@ -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; //项目名称
}

2
user-service/src/main/java/com/mh/user/entity/EnergySumEntity.java
Unescape View File

@ -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; //单耗

2
user-service/src/main/java/com/mh/user/entity/ProjectInfoEntity.java
Unescape View File

@ -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;
}

8
user-service/src/main/java/com/mh/user/job/DealDataJob.java
Unescape View File

@ -79,8 +79,8 @@ public class DealDataJob {
String curDate= ExchangeStringUtil.dateTime(1,"");
List<String> 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<String> 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);

12
user-service/src/main/java/com/mh/user/mapper/DataResultChMapper.java
Unescape View File

@ -20,7 +20,7 @@ public interface DataResultChMapper extends BaseMapper<DataResultChEntity> {
//----------------------------------------------------------------------------------------------
//保存冷量计数据
@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("<script>" +
@ -31,7 +31,7 @@ public interface DataResultChMapper extends BaseMapper<DataResultChEntity> {
" <if test='registerAddr!=null'> , register_addr = #{registerAddr} </if>" +
" <if test='registerName!=null'> , register_name = #{registerName} </if>" +
" <if test='curValue!=null'> , cur_value = #{curValue} </if>" +
" <if test='projectID!=null'> , project_id = #{projectID} </if>" +
" <if test='projectId!=null'> , project_id = #{projectId} </if>" +
" <if test='grade!=null'> , grade = #{grade} </if>" +
" where cur_date=#{curDate} and device_addr=#{deviceAddr} and device_type=#{deviceType}" +
"</script>")
@ -41,12 +41,12 @@ public interface DataResultChMapper extends BaseMapper<DataResultChEntity> {
" 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<DataResultChEntity> {
"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<DataResultChEntity> {
" t2.project_name " +
"order by " +
" t1.cur_date ")
List<DataResultChEntity> queryDataResultCh(@Param("projectID") String projectID, @Param("startDate") String startDate, @Param("curDate") String curDate);
List<DataResultChEntity> queryDataResultCh(@Param("projectId") String projectId, @Param("startDate") String startDate, @Param("curDate") String curDate);
}

32
user-service/src/main/java/com/mh/user/mapper/DataResultChillerMapper.java
Unescape View File

@ -21,7 +21,7 @@ public interface DataResultChillerMapper extends BaseMapper<DataResultChillerEnt
//保存冷水机数据
@Insert("insert into data_result_chiller(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 saveDataResultChiller(DataResultChEntity dataResultChEntity);
@Update("<script>" +
@ -32,37 +32,37 @@ public interface DataResultChillerMapper extends BaseMapper<DataResultChillerEnt
" <if test='registerAddr!=null'> , register_addr = #{registerAddr} </if>" +
" <if test='registerName!=null'> , register_name = #{registerName} </if>" +
" <if test='curValue!=null'> , cur_value = #{curValue} </if>" +
" <if test='projectID!=null'> , project_id = #{projectID} </if>" +
" <if test='projectId!=null'> , project_id = #{projectId} </if>" +
" <if test='grade!=null'> , grade = #{grade} </if>" +
" 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} " +
"</script>")
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<DataResultChEntity> queryDataResultChiller(@Param("projectID") String projectID,
List<DataResultChEntity> 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<DataResultChillerEnt
@Param("limit") int limit);
@SelectProvider(type = DataResultProvider.class,method = "dataResultChillerCount")
int dataResultChillerCount(@Param("projectID") String projectID,
int dataResultChillerCount(@Param("projectId") String projectId,
@Param("deviceAddr") String deviceAddr,
@Param("registerName") String registerName,
@Param("startDate") String startDate,
@ -99,7 +99,7 @@ public interface DataResultChillerMapper extends BaseMapper<DataResultChillerEnt
"cop," +
"rated_cop," +
"copy_date) values (" +
" #{deviceAddr},#{deviceName},#{projectID},#{lastValue},#{lastDate},#{curValue},#{curDate},#{ratio},#{calcValue},#{grade})")
" #{deviceAddr},#{deviceName},#{projectId},#{lastValue},#{lastDate},#{curValue},#{curDate},#{ratio},#{calcValue},#{grade})")
void saveDataChiller(ChillerModel chillerModel);
}

4
user-service/src/main/java/com/mh/user/mapper/DataResultClBakMapper.java
Unescape View File

@ -19,13 +19,13 @@ import org.apache.ibatis.annotations.Select;
public interface DataResultClBakMapper extends BaseMapper<DataResultClBakEntity> {
@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,

6
user-service/src/main/java/com/mh/user/mapper/DataResultClMapper.java
Unescape View File

@ -18,15 +18,15 @@ import java.util.List;
public interface DataResultClMapper extends BaseMapper<DataResultClEntity> {
//----------------------------------------------------------------------------------------------
//保存冷量计数据
@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("<script>" +
" update data_result_cl set " +
" <if test='deviceAddr!=null'> device_addr = #{deviceAddr} </if>" +
" <if test='deviceType!=null'> , device_type = #{deviceType} </if>" +
" <if test='projectID!=null'> , project_id = #{projectID} </if>" +
" <if test='projectId!=null'> , project_id = #{projectId} </if>" +
" <if test='lastValue!=null'> , last_value = #{lastValue} </if>" +
" <if test='lastDate!=null'> , last_date = #{lastDate} </if>" +
" <if test='curValue!=null'> , cur_value = #{curValue} </if>" +

6
user-service/src/main/java/com/mh/user/mapper/DataResultFifteenMiMapper.java
Unescape View File

@ -23,14 +23,14 @@ import java.util.List;
public interface DataResultFifteenMiMapper extends BaseMapper<DataResultFifteenMiEntity> {
@SelectProvider(type = DataResultProvider.class,method = "queryDataResultFifteenMi")
List<DataResultChEntity> queryDataResultFifteenMi(@Param("projectID") String projectID,
List<DataResultChEntity> queryDataResultFifteenMi(@Param("projectId") String projectId,
@Param("startDate") String startDate,
@Param("curDate") String curDate,
@Param("page") int page,
@Param("limit") int limit);
//@Select("select count(*) from data_result_fifteen_mi where projectID=#{projectID} and curDate>=#{startDate} and curDate<=#{curDate} ")
//@Select("select count(*) from data_result_fifteen_mi where projectId=#{projectId} and curDate>=#{startDate} and curDate<=#{curDate} ")
@SelectProvider(type = DataResultProvider.class,method = "dataResultFifteenMiCount")
int dataResultFifteenMiCount(@Param("projectID") String projectID,@Param("startDate") String startDate,@Param("curDate") String curDate);
int dataResultFifteenMiCount(@Param("projectId") String projectId,@Param("startDate") String startDate,@Param("curDate") String curDate);
}

6
user-service/src/main/java/com/mh/user/mapper/DataResultFiveMiMapper.java
Unescape View File

@ -20,14 +20,14 @@ import java.util.List;
public interface DataResultFiveMiMapper extends BaseMapper<DataResultFiveMiEntity> {
@SelectProvider(type = DataResultProvider.class,method = "queryDataResultFiveMi")
List<DataResultChEntity> queryDataResultFiveMi(@Param("projectID") String projectID,
List<DataResultChEntity> queryDataResultFiveMi(@Param("projectId") String projectId,
@Param("startDate") String startDate,
@Param("curDate") String curDate,
@Param("page") int page,
@Param("limit") int limit);
// @Select("select count(*) from data_result_five_mi where projectID=#{projectID} and curDate>=#{startDate} and curDate<=#{curDate} ")
// @Select("select count(*) from data_result_five_mi where projectId=#{projectId} and curDate>=#{startDate} and curDate<=#{curDate} ")
@SelectProvider(type = DataResultProvider.class,method = "dataResultFiveMiCount")
int dataResultFiveMiCount(@Param("projectID") String projectID,@Param("startDate") String startDate,@Param("curDate") String curDate);
int dataResultFiveMiCount(@Param("projectId") String projectId,@Param("startDate") String startDate,@Param("curDate") String curDate);
}

10
user-service/src/main/java/com/mh/user/mapper/DataResultMapper.java
Unescape View File

@ -15,14 +15,14 @@ public interface DataResultMapper extends BaseMapper<DataResultEntity> {
//保存水电表等数据
@Insert("insert into data_result(device_addr,device_type,project_id,last_value,last_date,cur_value,cur_date,ratio,calc_value,grade) values (" +
" #{deviceAddr},#{deviceType},#{projectID},#{lastValue},#{lastDate},#{curValue},#{curDate},#{ratio},#{calcValue},#{grade})")
" #{deviceAddr},#{deviceType},#{projectId},#{lastValue},#{lastDate},#{curValue},#{curDate},#{ratio},#{calcValue},#{grade})")
void saveDataResult(DataResultEntity dataResultEntity);
@Update("<script>" +
" update data_result set " +
" <if test='deviceAddr!=null'> device_addr = #{deviceAddr} </if>" +
" <if test='deviceType!=null'> , device_type = #{deviceType} </if>" +
" <if test='projectID!=null'> , project_id = #{projectID} </if>" +
" <if test='projectId!=null'> , project_id = #{projectId} </if>" +
" <if test='lastValue!=null'> , last_value = #{lastValue} </if>" +
" <if test='lastDate!=null'> , last_date = #{lastDate} </if>" +
" <if test='curValue!=null'> , cur_value = #{curValue} </if>" +
@ -36,7 +36,7 @@ public interface DataResultMapper extends BaseMapper<DataResultEntity> {
@Results(id="rs", value = {
@Result(property="deviceAddr",column="device_addr"),
@Result(property="deviceType",column="device_type"),
@Result(property="projectID",column="project_id"),
@Result(property="projectId",column="project_id"),
@Result(property="lastValue",column="last_value"),
@Result(property ="lastDate",column ="last_date"),
@Result(property ="curValue",column ="cur_value"),
@ -46,7 +46,7 @@ public interface DataResultMapper extends BaseMapper<DataResultEntity> {
@Result(property="grade",column="grade")
})
@SelectProvider(type = DataResultProvider.class,method = "queryDataResult")
List<DataResultEntity> queryDataResult(@Param("projectID") String projectID,
List<DataResultEntity> queryDataResult(@Param("projectId") String projectId,
@Param("startDate") String startDate,
@Param("endDate") String endDate,
@Param("deviceType") String deviceType,
@ -55,7 +55,7 @@ public interface DataResultMapper extends BaseMapper<DataResultEntity> {
@SelectProvider(type = DataResultProvider.class,method = "getDataResultCount")
int getDataResultCount(@Param("projectID") String projectID,
int getDataResultCount(@Param("projectId") String projectId,
@Param("startDate") String startDate,
@Param("endDate") String endDate,
@Param("deviceType") String deviceType,

12
user-service/src/main/java/com/mh/user/mapper/DataResultNowMapper.java
Unescape View File

@ -17,20 +17,20 @@ import java.util.List;
@Mapper
public interface DataResultNowMapper extends BaseMapper<DataResultNowEntity> {
@Insert("insert into data_result_now(deviceAddr,deviceType,funCode,registerAddr,registerName,curValue,curDate,projectID,grade) values (" +
" #{deviceAddr},#{deviceType},#{funCode},#{registerAddr},#{registerName},#{curValue},#{curDate},#{projectID},#{grade})")
@Insert("insert into data_result_now(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})")
void saveDataResultNow(DataResultChEntity dataResultChEntity);
@Delete("delete from data_result_now where deviceAddr=#{deviceAddr} and deviceType = #{deviceType} and registerAddr=#{registerAddr} and projectID=#{projectID}")
@Delete("delete from data_result_now where device_addr=#{deviceAddr} and device_type = #{deviceType} and register_addr=#{registerAddr} and project_id=#{projectId}")
void deleteDataResultNow(@Param("deviceAddr") String deviceAddr,
@Param("deviceType") String deviceType,
@Param("registerAddr") String registerAddr,
@Param("projectID") String projectID);
@Param("projectId") String projectId);
//实时参数读取
@Select("select * from data_result_now where deviceAddr=#{deviceAddr} and deviceType=#{deviceType} and projectID=#{projectID} ")
@Select("select * from data_result_now where device_addr=#{deviceAddr} and device_type=#{deviceType} and project_id=#{projectId} ")
List<DataResultChEntity> selectDataResultNow(@Param("deviceAddr") String deviceAddr,
@Param("deviceType") String deviceType,
@Param("projectID") String projectID);
@Param("projectId") String projectId);
}

22
user-service/src/main/java/com/mh/user/mapper/DataResultOneMiMapper.java
Unescape View File

@ -20,27 +20,27 @@ public interface DataResultOneMiMapper extends BaseMapper<DataResultOneMiEntity>
//----------------------------------------------------------------------------------------------------
@Results(id="rsc", value = {
@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 = "queryDataResultOneMi")
List<DataResultChEntity> queryDataResultOneMi(@Param("projectID") String projectID,
List<DataResultChEntity> queryDataResultOneMi(@Param("projectId") String projectId,
@Param("startDate") String startDate,
@Param("curDate") String curDate,
@Param("page") int page,
@Param("limit") int limit);
//查询记录数
// @Select("select count(*) from data_result_one_mi where projectID=#{projectID} and curDate>=#{startDate} and curDate<=#{curDate} ")
// @Select("select count(*) from data_result_one_mi where projectId=#{projectId} and curDate>=#{startDate} and curDate<=#{curDate} ")
@SelectProvider(type = DataResultProvider.class,method = "dataResultOneMiCount")
int dataResultOneMiCount(@Param("projectID") String projectID,@Param("startDate") String startDate,@Param("curDate") String curDate);
int dataResultOneMiCount(@Param("projectId") String projectId,@Param("startDate") String startDate,@Param("curDate") String curDate);
}

36
user-service/src/main/java/com/mh/user/mapper/DeviceCodeMapper.java
Unescape View File

@ -23,33 +23,33 @@ public interface DeviceCodeMapper extends BaseMapper<DeviceCodeEntity> {
@Result(column = "device_addr",property = "deviceAddr" ),
@Result(column = "device_name", property = "deviceName")
})
@Select("select * from device_code where project_id=#{projectID} and device_type='冷水机'")
List<DeviceModel> selectDevices(@Param("projectID") String projectID);
@Select("select * from device_code where project_id=#{projectId} and device_type='冷水机'")
List<DeviceModel> selectDevices(@Param("projectId") String projectId);
//查询多个冷水机相关信息
@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 device_code where project_id=#{projectID} and device_addr=#{deviceAddr} ")
List<ChillerModel> queryChiller(@Param("projectID") String projectID, @Param("device_addr") String deviceAddr);
@Select("select * from device_code where project_id=#{projectId} and device_addr=#{deviceAddr} ")
List<ChillerModel> queryChiller(@Param("projectId") String projectId, @Param("device_addr") String deviceAddr);
}

12
user-service/src/main/java/com/mh/user/mapper/DeviceCodeParamMapper.java
Unescape View File

@ -31,14 +31,14 @@ public interface DeviceCodeParamMapper extends BaseMapper<DeviceCodeParamEntity>
@Result(property ="createTime",column ="create_time"),
@Result(property ="grade",column ="grade"),
@Result(property ="digit",column ="digit"),
@Result(property ="projectID",column ="project_id")
@Result(property ="projectId",column ="project_id")
})
@Select("select id, " +
"device_addr, " +
"device_type, " +
"str_data, " +
"data_port, " +
"baudrate, " +
"baud_rate, " +
"brand, " +
"fun_code, " +
"register_addr, " +
@ -63,15 +63,15 @@ public interface DeviceCodeParamMapper extends BaseMapper<DeviceCodeParamEntity>
//查询所有指令参数
@ResultMap("rs")
@Select("select * from device_code_param where project_id=#{projectID} and device_type=#{deviceType} and device_addr=#{deviceAddr} and register_addr=#{registerAddr}")
DeviceCodeParamEntity queryDeviceCodeParam(@Param("projectID") String projectID,
@Select("select * from device_code_param where project_id=#{projectId} and device_type=#{deviceType} and device_addr=#{deviceAddr} and register_addr=#{registerAddr}")
DeviceCodeParamEntity queryDeviceCodeParam(@Param("projectId") String projectId,
@Param("deviceType") String deviceType,
@Param("deviceAddr") String deviceAddr,
@Param("registerAddr") String registerAddr);
//查询记录数
@Select("select count(*) from device_code_param where project_id=#{projectId} ")
int queryCount(@Param("projectId") String projectID);
int queryCount(@Param("projectId") String projectId);
//查询记录数,所有项目
@Select("select count(*) from device_code_param ")
@ -98,7 +98,7 @@ public interface DeviceCodeParamMapper extends BaseMapper<DeviceCodeParamEntity>
")" +
"values " +
"<foreach collection='deviceCodeParamEntityList' item='item' separator=','>" +
"(#{item.deviceAddr},#{item.deviceName},#{item.deviceType},#{item.dataPort},#{item.baudRate},#{item.brand},#{item.funCode},#{item.registerAddr},#{item.registerName},getDate(),#{item.projectID},#{item.parity},#{item.digit},#{item.grade},#{item.strData})" +
"(#{item.deviceAddr},#{item.deviceName},#{item.deviceType},#{item.dataPort},#{item.baudRate},#{item.brand},#{item.funCode},#{item.registerAddr},#{item.registerName},getDate(),#{item.projectId},#{item.parity},#{item.digit},#{item.grade},#{item.strData})" +
"</foreach>" +
"</script>")
void insertDeviceCodeParamList(@Param("deviceCodeParamEntityList") List<DeviceCodeParamEntity> deviceCodeParamEntityList);

34
user-service/src/main/java/com/mh/user/mapper/DeviceInfoMapper.java
Unescape View File

@ -27,31 +27,31 @@ public interface DeviceInfoMapper {
@Result(property="systemId",column="system_id")
})
List<DeviceInfoEntity> 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);
}

45
user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java
Unescape View File

@ -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<DeviceInstallEntity> {
/**
* 设备安装模块
* 保存设备信息
* @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("<script>" +
" update device_code set " +
" <if test='deviceName!=null'> deviceName = #{deviceName} </if>" +
" <if test='deviceType!=null'> , deviceType = #{deviceType} </if>" +
" <if test='dataCom!=null'> , dataPort = #{dataPort} </if>" +
" <if test='deviceName!=null'> device_name = #{deviceName} </if>" +
" <if test='deviceType!=null'> , device_type = #{deviceType} </if>" +
" <if test='dataCom!=null'> , data_port = #{dataPort} </if>" +
" <if test='ratio!=null'> , ratio = #{ratio} </if>" +
" <if test='baudRate!=null'> , baudRate = #{baudRate} </if>" +
" <if test='baudRate!=null'> , baud_rate = #{baudRate} </if>" +
" <if test='brand!=null'> , brand = #{brand} </if>" +
" <if test='installPosition!=null'> , installPosition = #{installPosition} </if>" +
" <if test='installPosition!=null'> , install_position = #{installPosition} </if>" +
" <if test='installer!=null'> , installer = #{installer} </if>" +
" <if test='projectID!=null'> , project_id = #{projectID} </if>" +
" <if test='projectId!=null'> , project_id = #{projectId} </if>" +
" <if test='remarks!=null'> , remarks = #{remarks} </if>" +
" where id = #{id} " +
"</script>")
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<DeviceInstallEntity> getAllDevice(@Param("page") int page, @Param("limit") int limit);
//查询有多个采集参数的设备
@ResultMap("rs")
@Select("select * from device_code where Project_id=#{ProjectID} ")
List<DeviceInstallEntity> selectDeviceParams(@Param("ProjectID") String ProjectID);
//查询有多个采集参数的设备
@ResultMap("rs")
@Select("select * from device_code ")
List<DeviceInstallEntity> 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<DeviceInstallEntity> queryDevice(@Param("project_id") String projectID,
List<DeviceInstallEntity> 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();
//修改启动状态

22
user-service/src/main/java/com/mh/user/mapper/EnergyDataMapper.java
Unescape View File

@ -14,7 +14,7 @@ public interface EnergyDataMapper extends BaseMapper<EnergyDataEntity> {
@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<EnergyDataEntity> {
@Result(property = "cl", column = "cl"),
@Result(property = "cop", column = "cop")
})
List<EnergyDataEntity> queryEnergyDataMi(@Param("projectID") String projectID,
List<EnergyDataEntity> 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<EnergyDataEntity> {
@Result(property = "projectId", column = "project_id"),
@Result(property = "projectName", column = "project_name")
})
List<EnergyDataEntity> queryEnergyDataHour(@Param("projectID") String projectID,
List<EnergyDataEntity> 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<EnergyDataEntity> queryEnergyDataDay(@Param("projectID") String projectID,
List<EnergyDataEntity> 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<EnergyDataEntity> queryEnergyDataMonth(@Param("projectID") String projectID,
List<EnergyDataEntity> 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<EnergyDataEntity> queryEnergyDataYear(@Param("projectID") String projectID,
List<EnergyDataEntity> 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);

18
user-service/src/main/java/com/mh/user/mapper/EnergyMapper.java
Unescape View File

@ -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<EnergyEntity> queryEnergyHour(@Param("projectID") String projectID,
List<EnergyEntity> 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<EnergyEntity> queryEnergyDay(@Param("projectID") String projectID,
List<EnergyEntity> 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<EnergyEntity> queryEnergyMonth(@Param("projectID") String projectID,
List<EnergyEntity> 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<EnergyEntity> queryEnergyYear(@Param("projectID") String projectID,
List<EnergyEntity> 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,

2
user-service/src/main/java/com/mh/user/mapper/MeterInfoMapper.java
Unescape View File

@ -26,6 +26,6 @@ public interface MeterInfoMapper {
@Result(property="systemId",column="system_id")
})
List<MeterInfoEntity> queryMeterInfo(@Param("systemID") String systemID,
@Param("projectID") String projectID);
@Param("projectId") String projectId);
}

4
user-service/src/main/java/com/mh/user/mapper/ProjectInfoMapper.java
Unescape View File

@ -17,11 +17,11 @@ public interface ProjectInfoMapper extends BaseMapper<ProjectInfoEntity> {
@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<ProjectInfoEntity> queryProjectInfo(@Param("systemID") String systemID );
//通过id查找对应的名称

6
user-service/src/main/java/com/mh/user/mapper/StrategyInfoMapper.java
Unescape View File

@ -15,10 +15,10 @@ public interface StrategyInfoMapper extends BaseMapper<StrategyInfoEntity> {
"<if test='systemID != null and systemID != \"\"'>" +
" and system_id = #{systemID} " +
"</if>" +
"<if test='projectID != null and projectID != \"\"'>" +
" and project_id = #{projectID} " +
"<if test='projectId != null and projectId != \"\"'>" +
" and project_id = #{projectId} " +
"</if>" +
" order by id " +
"</script>")
List<StrategyInfoEntity> queryStrategyInfo(@Param("systemID") String systemID,@Param("projectID") String projectID);
List<StrategyInfoEntity> queryStrategyInfo(@Param("systemID") String systemID,@Param("projectId") String projectId);
}

6
user-service/src/main/java/com/mh/user/mapper/SysMenuMapper.java
Unescape View File

@ -26,12 +26,12 @@ public interface SysMenuMapper {
List<SysMenu> findPage();
List<SysMenu> findPageByName(@Param(value = "systemID") String systemID,
List<SysMenu> findPageByName(@Param(value = "systemId") String systemID,
@Param(value = "name") String name);
List<SysMenu> findAll(@Param(value = "systemID") String systemID);
List<SysMenu> findAll(@Param(value = "systemId") String systemID);
List<SysMenu> findByUserName(@Param(value = "systemID") String systemID,
List<SysMenu> findByUserName(@Param(value = "systemId") String systemID,
@Param(value = "userName") String userName);
List<SysMenu> findRoleMenus(@Param(value = "roleId") Long roleId);

10
user-service/src/main/java/com/mh/user/mapper/chillers/DealDataMapper.java
Unescape View File

@ -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<String> queryProjectId(@Param("systemID") String systemID );
// @Select("test(#{name,jdbcType=VARCHAR,mode=IN},#{gender,jdbcType=VARCHAR,mode=OUT})")

60
user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java
Unescape View File

@ -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} ");

6
user-service/src/main/java/com/mh/user/mapper/provider/DeviceInfoProvider.java
Unescape View File

@ -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} ");

82
user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java
Unescape View File

@ -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 ");

48
user-service/src/main/java/com/mh/user/mapper/provider/EnergyProvider.java
Unescape View File

@ -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} ");

6
user-service/src/main/java/com/mh/user/mapper/provider/MeterInfoProvider.java
Unescape View File

@ -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());

2
user-service/src/main/java/com/mh/user/model/EnergyModel.java
Unescape View File

@ -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;

2
user-service/src/main/java/com/mh/user/model/EnergyParam.java
Unescape View File

@ -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;

2
user-service/src/main/java/com/mh/user/model/QueueParam.java
Unescape View File

@ -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;
}

2
user-service/src/main/java/com/mh/user/model/SysMenu.java
Unescape View File

@ -27,7 +27,7 @@ public class SysMenu extends BaseModel {
private Integer orderNum;
private String systemID;
private String systemId;
// 非数据库字段
private String parentTitle;
// 非数据库字段

2
user-service/src/main/java/com/mh/user/model/SysUser.java
Unescape View File

@ -37,7 +37,7 @@ public class SysUser extends BaseModel {
private Date loginTime;
private String systemID;
private String systemId;
private List<SysUserRole> userRoles = new ArrayList<>();

34
user-service/src/main/java/com/mh/user/netty/EchoServerHandler.java
Unescape View File

@ -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()......");
}
// 客户端断开

2
user-service/src/main/java/com/mh/user/security/UserDetailsServiceImpl.java
Unescape View File

@ -32,7 +32,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
throw new UsernameNotFoundException("该用户不存在");
}
// 用户权限列表，根据用户拥有的权限标识与如 @PreAuthorize("hasAuthority('sys:menu:view')") 标注的接口对比，决定是否可以调用接口
Set<String> permissions = sysUserService.findPermissions(user.getSystemID(),user.getUserName());
Set<String> permissions = sysUserService.findPermissions(user.getSystemId(),user.getUserName());
List<GrantedAuthority> grantedAuthorities = permissions.stream().map(GrantedAuthorityImpl::new).collect(Collectors.toList());
System.out.println("获取权限列表"+grantedAuthorities);
System.out.println(user.getUserName());

2
user-service/src/main/java/com/mh/user/serialport/SerialPortSendReceive.java
Unescape View File

@ -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());
//下面是对返回数据根据不同的设备进行相关解析处理

2
user-service/src/main/java/com/mh/user/serialport/SerialPortSingle.java
Unescape View File

@ -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);

22
user-service/src/main/java/com/mh/user/service/DataResultService.java
Unescape View File

@ -14,14 +14,14 @@ public interface DataResultService {
void updateDataResult(DataResultEntity dataResultEntity);
List<DataResultEntity> queryDataResult(String projectID,
List<DataResultEntity> 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<DataResultChEntity> queryDataResultMi(String projectID,String startDate,String curDate,int page,int limit, int type);
List<DataResultChEntity> 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<DataResultChEntity> queryDataResultSec(String projectID,String startDate,String curDate);
List<DataResultChEntity> 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<DataResultChEntity> selectDataResultNow(String deviceAddr, String deviceType, String projectID);
List<DataResultChEntity> selectDataResultNow(String deviceAddr, String deviceType, String projectId);
List<DataResultChEntity> queryDataResultChiller(String projectID,
List<DataResultChEntity> 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,

2
user-service/src/main/java/com/mh/user/service/DeviceCodeParamService.java
Unescape View File

@ -21,7 +21,7 @@ public interface DeviceCodeParamService {
List<DeviceCodeParamEntity> 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);

8
user-service/src/main/java/com/mh/user/service/DeviceInfoService.java
Unescape View File

@ -10,12 +10,12 @@ import java.util.List;
public interface DeviceInfoService {
List<DeviceInfoEntity> queryDeviceInfo(String systemID, String projectID,String deviceType);
List<DeviceInfoEntity> queryDeviceInfo(String systemID, String projectId,String deviceType);
//查询冷水机设备
List<DeviceModel> selectDevices(String projectID);
List<DeviceModel> selectDevices(String projectId);
List<ChillerModel> queryChiller(String projectID, String deviceAddr);
List<ChillerModel> queryChiller(String projectId, String deviceAddr);
ChillerModel selectChiller(String projectID,String deviceAddr);
ChillerModel selectChiller(String projectId,String deviceAddr);
}

2
user-service/src/main/java/com/mh/user/service/MeterInfoService.java
Unescape View File

@ -5,5 +5,5 @@ import java.util.List;
public interface MeterInfoService {
List<MeterInfoEntity> queryMeterInfo(String systemID,String projectID);
List<MeterInfoEntity> queryMeterInfo(String systemID,String projectId);
}

2
user-service/src/main/java/com/mh/user/service/StrategyInfoService.java
Unescape View File

@ -5,5 +5,5 @@ import com.mh.user.entity.StrategyInfoEntity;
import java.util.List;
public interface StrategyInfoService {
List<StrategyInfoEntity> queryStrategyInfo(String systemID, String projectID);
List<StrategyInfoEntity> queryStrategyInfo(String systemID, String projectId);
}

4
user-service/src/main/java/com/mh/user/service/chillers/DealDataService.java
Unescape View File

@ -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);

8
user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java
Unescape View File

@ -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

73
user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java
Unescape View File

@ -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<DataResultEntity> queryDataResult(String projectID, String startDate, String endDate, String deviceType, int page, int limit) {
return dataResultMapper.queryDataResult(projectID, startDate, endDate, deviceType, page, limit);
public List<DataResultEntity> 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<DataResultChEntity> queryDataResultMi(String projectID, String startDate, String curDate, int page, int limit, int type) {
public List<DataResultChEntity> 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<DataResultChEntity> queryDataResultSec(String projectID, String startDate, String curDate) {
return dataResultChMapper.queryDataResultCh(projectID, startDate, curDate);
public List<DataResultChEntity> 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<DataResultChEntity> selectDataResultNow(String deviceAddr, String deviceType, String projectID) {
return dataResultNowMapper.selectDataResultNow(deviceAddr, deviceType, projectID);
public List<DataResultChEntity> selectDataResultNow(String deviceAddr, String deviceType, String projectId) {
return dataResultNowMapper.selectDataResultNow(deviceAddr, deviceType, projectId);
}
@Override
public List<DataResultChEntity> 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<DataResultChEntity> 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);
}
}

4
user-service/src/main/java/com/mh/user/service/impl/DeviceCodeParamServiceImpl.java
Unescape View File

@ -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

16
user-service/src/main/java/com/mh/user/service/impl/DeviceInfoServiceImpl.java
Unescape View File

@ -21,22 +21,22 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
DeviceCodeMapper deviceCodeMapper;
@Override
public List<DeviceInfoEntity> queryDeviceInfo(String systemID, String projectID,String deviceType) {
return deviceInfoMapper.queryDeviceInfo(systemID,projectID,deviceType);
public List<DeviceInfoEntity> queryDeviceInfo(String systemID, String projectId,String deviceType) {
return deviceInfoMapper.queryDeviceInfo(systemID,projectId,deviceType);
}
@Override
public List<DeviceModel> selectDevices(String projectID) {
return deviceCodeMapper.selectDevices(projectID);
public List<DeviceModel> selectDevices(String projectId) {
return deviceCodeMapper.selectDevices(projectId);
}
@Override
public List<ChillerModel> queryChiller(String projectID, String deviceAddr) {
return deviceCodeMapper.queryChiller(projectID, deviceAddr);
public List<ChillerModel> 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);
}
}

28
user-service/src/main/java/com/mh/user/service/impl/EnergyDataServiceImpl.java
Unescape View File

@ -17,7 +17,7 @@ public class EnergyDataServiceImpl implements EnergyDataService {
@Override
public List<EnergyDataEntity> 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);
}
}

20
user-service/src/main/java/com/mh/user/service/impl/EnergyServiceImpl.java
Unescape View File

@ -53,7 +53,7 @@ public class EnergyServiceImpl implements EnergyService {
@Override
public List<EnergyEntity> 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<EnergyEntity> list=new ArrayList<EnergyEntity>();
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;
}

4
user-service/src/main/java/com/mh/user/service/impl/MeterInfoServiceImpl.java
Unescape View File

@ -15,7 +15,7 @@ public class MeterInfoServiceImpl implements MeterInfoService {
MeterInfoMapper meterInfoMapper;
@Override
public List<MeterInfoEntity> queryMeterInfo(String systemID, String projectID) {
return meterInfoMapper.queryMeterInfo(systemID,projectID);
public List<MeterInfoEntity> queryMeterInfo(String systemID, String projectId) {
return meterInfoMapper.queryMeterInfo(systemID,projectId);
}
}

4
user-service/src/main/java/com/mh/user/service/impl/StrategyInfoServiceImpl.java
Unescape View File

@ -15,7 +15,7 @@ public class StrategyInfoServiceImpl implements StrategyInfoService {
StrategyInfoMapper strategyInfoMapper;
@Override
public List<StrategyInfoEntity> queryStrategyInfo(String systemID, String projectID) {
return strategyInfoMapper.queryStrategyInfo(systemID,projectID);
public List<StrategyInfoEntity> queryStrategyInfo(String systemID, String projectId) {
return strategyInfoMapper.queryStrategyInfo(systemID,projectId);
}
}

6
user-service/src/main/java/com/mh/user/sqlmapper/SysMenuMapper.xml
Unescape View File

@ -15,7 +15,7 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="last_update_by" jdbcType="BIGINT" property="lastUpdateBy" />
<result column="last_update_time" jdbcType="TIMESTAMP" property="lastUpdateTime" />
<result column="system_id" jdbcType="VARCHAR" property="systemID" />
<result column="system_id" jdbcType="VARCHAR" property="systemId" />
</resultMap>
<sql id="Base_Column_List">
id, parent_id, title,menu_name, component, path, menu_type, icon, order_num, create_by, create_time,
@ -189,7 +189,7 @@
<select id="findAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from sys_menu where system_id=#{systemID,jdbcType=BIGINT}
from sys_menu where system_id=#{systemId,jdbcType=BIGINT}
</select>
<select id="findPage" resultMap="BaseResultMap">
select
@ -206,7 +206,7 @@
<select id="findByUserName" parameterType="java.lang.String" resultMap="BaseResultMap">
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}
</select>
<select id="findRoleMenus" parameterType="java.lang.Long" resultMap="BaseResultMap">
select m.* from sys_menu m, sys_role_menu rm

46
user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java
Unescape View File

@ -96,9 +96,9 @@ public class AnalysisReceiveOrder485 {
dataResultCh.setRegisterAddr(deviceCodeParam.getRegisterAddr());
dataResultCh.setRegisterName(deviceCodeParam.getRegisterName());
dataResultCh.setGrade(deviceCodeParam.getGrade());
dataResultCh.setProjectId(deviceCodeParam.getProjectID());
dataResultCh.setProjectId(deviceCodeParam.getProjectId());
dataResultCh.setGrade(deviceCodeParam.getGrade());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectID());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
log.info("冷量计==>" + cloudId + ",读数==>" + dataResultCh.getCurValue() + ",项目名称==>" + projectName);
dataResultService.saveDataResultCh(dataResultCh);
log.info("冷量计保存数据库成功!项目名称:" + projectName);
@ -111,8 +111,8 @@ public class AnalysisReceiveOrder485 {
dataResultCl.setRegisterAddr(deviceCodeParam.getRegisterAddr());
dataResultCl.setRegisterName(deviceCodeParam.getRegisterName());
dataResultCl.setGrade(deviceCodeParam.getGrade());
dataResultCl.setProjectId(deviceCodeParam.getProjectID());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectID());
dataResultCl.setProjectId(deviceCodeParam.getProjectId());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
log.info("冷量计==>" + cloudId + ",累计读数==>" + lData + ",项目名称==>" + projectName);
if (lData < 99999999) {
if (lData != 2231365) {
@ -151,10 +151,10 @@ public class AnalysisReceiveOrder485 {
DecimalFormat decimalFormat = new DecimalFormat("0.00");
// 表号
String cloudId = ExchangeStringUtil.hexToDec(dataStr.substring(0, 2));
String projectID = queueParam.getProjectID();
String projectId = queueParam.getProjectId();
String registerAddr = queueParam.getRegisterAddr();
String deviceType = queueParam.getDeviceType();
DeviceCodeParamEntity deviceCodeParam = deviceCodeParamService.queryDeviceCodeParam(projectID, deviceType, cloudId, registerAddr);
DeviceCodeParamEntity deviceCodeParam = deviceCodeParamService.queryDeviceCodeParam(projectId, deviceType, cloudId, registerAddr);
// 读数
String data = "";
data = dataStr.substring(dataStr.length() - 8, dataStr.length() - 6)
@ -184,9 +184,9 @@ public class AnalysisReceiveOrder485 {
dataResultCh.setRegisterAddr(deviceCodeParam.getRegisterAddr());
dataResultCh.setRegisterName(deviceCodeParam.getRegisterName());
dataResultCh.setGrade(deviceCodeParam.getGrade());
dataResultCh.setProjectId(deviceCodeParam.getProjectID());
dataResultCh.setProjectId(deviceCodeParam.getProjectId());
dataResultCh.setGrade(deviceCodeParam.getGrade());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectID());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
log.info("cloudID==>" + cloudId + ",curValue==>" + dataResultCh.getCurValue() + ",projectName==>" + projectName);
dataResultService.saveDataResultCh(dataResultCh);
log.info("cloud save data success!projectName:" + projectName);
@ -200,8 +200,8 @@ public class AnalysisReceiveOrder485 {
dataResultCl.setRegisterAddr(deviceCodeParam.getRegisterAddr());
dataResultCl.setRegisterName(deviceCodeParam.getRegisterName());
dataResultCl.setGrade(deviceCodeParam.getGrade());
dataResultCl.setProjectId(deviceCodeParam.getProjectID());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectID());
dataResultCl.setProjectId(deviceCodeParam.getProjectId());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
log.info("cloudID==>" + cloudId + ",curValue34==>" + lData + ",projectName==>" + projectName);
if (lData < 99999999) {
if (lData != 2231365) {
@ -270,12 +270,12 @@ public class AnalysisReceiveOrder485 {
DataResultEntity dataResultEntity = new DataResultEntity();
dataResultEntity.setDeviceAddr(meterId);//通讯编号
dataResultEntity.setDeviceType("电表");//类型
dataResultEntity.setProjectID(deviceCodeParam.getProjectID());//所属项目
dataResultEntity.setProjectId(deviceCodeParam.getProjectId());//所属项目
dataResultEntity.setCurValue(new BigDecimal(data)); //当前读数
dataResultEntity.setCurDate(sdf1.parse(dateStr)); //当前日期
dataResultEntity.setGrade(deviceCodeParam.getGrade());
dataResultService.saveDataResult(dataResultEntity);
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectID());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
log.info("电表==>" + meterId + ",读数==>" + data + ",项目名称==>" + projectName);
log.info("电表保存数据成功!项目名称:" + projectName);
} catch (Exception e) {
@ -307,10 +307,10 @@ public class AnalysisReceiveOrder485 {
String meterId = checkStr.substring(12, 14) + checkStr.substring(10, 12) + checkStr.substring(8, 10)
+ checkStr.substring(6, 8) + checkStr.substring(4, 6) + checkStr.substring(2, 4);
meterId = String.format("%012d", Long.parseLong(meterId));
String projectID = queueParam.getProjectID();
String projectId = queueParam.getProjectId();
String registerAddr = queueParam.getRegisterAddr();
String deviceType = queueParam.getDeviceType();
DeviceCodeParamEntity deviceCodeParam = deviceCodeParamService.queryDeviceCodeParam(projectID, deviceType, meterId, registerAddr);
DeviceCodeParamEntity deviceCodeParam = deviceCodeParamService.queryDeviceCodeParam(projectId, deviceType, meterId, registerAddr);
//读数
String data = "";
StringBuilder stringBuilder = new StringBuilder();
@ -345,12 +345,12 @@ public class AnalysisReceiveOrder485 {
DataResultEntity dataResultEntity = new DataResultEntity();
dataResultEntity.setDeviceAddr(meterId);//通讯编号
dataResultEntity.setDeviceType("电表");//类型
dataResultEntity.setProjectID(deviceCodeParam.getProjectID());//所属项目
dataResultEntity.setProjectId(deviceCodeParam.getProjectId());//所属项目
dataResultEntity.setCurValue(new BigDecimal(data)); //当前读数
dataResultEntity.setCurDate(sdf1.parse(dateStr)); //当前日期
dataResultEntity.setGrade(deviceCodeParam.getGrade());
dataResultService.saveDataResult(dataResultEntity);
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectID());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
log.info("meterID==>" + meterId + ",meter curValue==>" + data + ",projectName==>" + projectName);
log.info("meter save data success!projectName:" + projectName);
} catch (Exception e) {
@ -365,7 +365,7 @@ public class AnalysisReceiveOrder485 {
}
// 水表
public void analysisWtMeterOrder485(final String dataStr, final String registerAddr, final String brand, String projectID) {
public void analysisWtMeterOrder485(final String dataStr, final String registerAddr, final String brand, String projectId) {
threadPoolService.execute(() -> {
//时间,创建SimpleDateFormat对象，指定样式 2019-05-13 22:39:30
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -432,9 +432,9 @@ public class AnalysisReceiveOrder485 {
dataResultEntity.setDeviceType("水表");
dataResultEntity.setCurValue(new BigDecimal(data)); //当前读数
dataResultEntity.setCurDate(sdf1.parse(dateStr)); //当前日期
dataResultEntity.setProjectID(projectID);
dataResultEntity.setProjectId(projectId);
dataResultService.saveDataResult(dataResultEntity);
log.info("wtMeter save data success!projectID:" + projectID);
log.info("wtMeter save data success!projectId:" + projectId);
} catch (Exception e) {
log.error("保存水表数据失败!", e);
}
@ -519,11 +519,11 @@ public class AnalysisReceiveOrder485 {
dataResultCh.setRegisterName(deviceCodeParam.getRegisterName());
dataResultCh.setGrade(deviceCodeParam.getGrade());
dataResultCh.setFunCode(deviceCodeParam.getFunCode());
dataResultCh.setProjectId(deviceCodeParam.getProjectID());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectID());
dataResultCh.setProjectId(deviceCodeParam.getProjectId());
String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
log.info("冷水机:" + chillerAddr + ",状态:" + data + ",项目名称:" + projectName);
dataResultService.saveDataResultChiller(dataResultCh);
dataResultService.deleteDataResultNow(deviceCodeParam.getDeviceAddr(), deviceCodeParam.getDeviceType(), deviceCodeParam.getRegisterAddr(), deviceCodeParam.getProjectID());
dataResultService.deleteDataResultNow(deviceCodeParam.getDeviceAddr(), deviceCodeParam.getDeviceType(), deviceCodeParam.getRegisterAddr(), deviceCodeParam.getProjectId());
log.info("冷水机保存成功!项目名称:" + projectName);
}
@ -733,7 +733,7 @@ public class AnalysisReceiveOrder485 {
map.put("recData", queueParam.getRecData());
map.put("deviceType", queueParam.getDeviceType());
map.put("registerAddr", queueParam.getRegisterAddr());
map.put("projectID", queueParam.getProjectID());
map.put("projectId", queueParam.getProjectId());
map.put("copyTime", queueParam.getCopyTime());
String jsonString = JSON.toJSONString(map); //map转json字符串
rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_NAME, RabbitmqConfig.ROUTINGKEY_NAME, jsonString);

2
user-service/src/main/java/com/mh/user/utils/GetReadOrder485.java
Unescape View File

@ -388,7 +388,7 @@ public class GetReadOrder485 {
deviceCodeParamEntity1.setBaudRate(devices.getBaudRate());
deviceCodeParamEntity1.setBrand(devices.getBrand());
deviceCodeParamEntity1.setDataPort(devices.getDataPort());
deviceCodeParamEntity1.setProjectID(devices.getProjectID());
deviceCodeParamEntity1.setProjectId(devices.getProjectId());
deviceCodeParamEntity1.setParity(devices.getParity());
deviceCodeParamEntity1.setGrade(devices.getGrade());
deviceCodeParamEntity1.setDigit(devices.getDigit());

2
user-service/src/main/java/com/mh/user/utils/Test.java
Unescape View File

@ -122,7 +122,7 @@ public class Test {
deviceCodeParamEntity.setRegisterAddr("34");
deviceCodeParamEntity.setRegisterName("累积量");
deviceCodeParamEntity.setGrade(1);
deviceCodeParamEntity.setProjectID("3");
deviceCodeParamEntity.setProjectId("3");
analysis.analysisCloudOrder485("5A0304AEF600D911B6",deviceCodeParamEntity);
}

7
user-service/src/main/resources/application-prod.yml
Unescape View File

@ -5,7 +5,7 @@ spring:
name: jnd-user-service
datasource:
#添加allowMultiQueries=true 在批量更新时才不会出错
url: jdbc:sqlserver://111.230.50.186:32012;DatabaseName=mh_jnd;allowMultiQueries=true
url: jdbc:sqlserver://111.230.50.186:32012;DatabaseName=mh_jnd2;allowMultiQueries=true
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: jnd
password: Mh@803tech
@ -90,5 +90,10 @@ logging:
path: logs/${spring.application.name}
##软件最后更新日期20230116
mybatis:
mapper-locations: classpath:com/mh/user/sqlmapper/*.xml
configuration:
map-underscore-to-camel-case: true
type-aliases-package: com.mh.user.entity

5
user-service/src/main/resources/application-test.yml
Unescape View File

@ -90,5 +90,10 @@ logging:
path: logs/${spring.application.name}
##软件最后更新日期20230116
mybatis:
mapper-locations: classpath:com/mh/user/sqlmapper/*.xml
configuration:
map-underscore-to-camel-case: true
type-aliases-package: com.mh.user.entity

4
user-service/src/test/java/com/mh/user/ReportTest1.java
Unescape View File

@ -1,7 +1,7 @@
package com.mh.user;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.mh.user.entity.ReportParamEntity;
import com.mh.user.entity.chart.BaseChartEntity;
import com.mh.user.entity.chart.ChartEntity;

2
user-service/src/test/java/com/mh/user/chart/ChartTest.java
Unescape View File

@ -1,6 +1,6 @@
package com.mh.user.chart;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson2.JSONArray;
import com.mh.user.entity.chart.*;
import java.math.BigDecimal;

Write Preview
Loading…
Cancel
Save