src/main/java/com/whyc/Application.java
@@ -1,7 +1,5 @@ package com.whyc; //import com.spring4all.swagger.EnableSwagger2Doc; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; src/main/java/com/whyc/controller/CentralMonitorSysCtrlController.java
@@ -6,15 +6,17 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RequestMapping("CentralMonitorSysCtrl") @RequestMapping("centralMonitorSysCtrl") @RestController @Api(tags = "集中监控系统Ctrl") @Controller public class CentralMonitorSysCtrlController { @Autowired src/main/java/com/whyc/controller/CentralMonitorSysRTController.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("CentralMonitorSysRT") @RequestMapping("centralMonitorSysRT") @RestController @Api(tags = "集中监控系统RT") public class CentralMonitorSysRTController { src/main/java/com/whyc/controller/CentralMonitorSysSTController.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("CentralMonitorSysST") @RequestMapping("centralMonitorSysST") @RestController @Api(tags = "集中监控系统ST") public class CentralMonitorSysSTController { src/main/java/com/whyc/controller/MotorSystemInfController.java
@@ -17,7 +17,7 @@ /** * Motor系统 */ @RequestMapping("motorSystem") @RequestMapping("motorSystemInf") @RestController @Api(tags = "MotorSystem设备信息") public class MotorSystemInfController { src/main/java/com/whyc/controller/OilCommController.java
New file @@ -0,0 +1,42 @@ package com.whyc.controller; import com.whyc.dto.Response; import com.whyc.pojo.OilComm; import com.whyc.service.OilCommService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * Oil通讯 */ @RequestMapping("OilComm") @RestController @Api(tags = "Oil通讯") @Slf4j public class OilCommController { @Autowired private OilCommService service; @GetMapping("all") @ApiOperation(value = "获取所有oil信息") public Response<List<OilComm>> getAll(){ return service.getAll(); } @GetMapping("infoByDevId") @ApiOperation(value = "根据设备id获取oil信息") public Response<OilComm> getInfoByDevId(@RequestParam int devId){ return service.getInfoByDevId(devId); } } src/main/java/com/whyc/controller/UPSCommController.java
File was renamed from src/main/java/com/whyc/controller/UPSController.java @@ -1,10 +1,9 @@ package com.whyc.controller; import com.whyc.dto.Response; import com.whyc.pojo.UPS; import com.whyc.service.UPSService; import com.whyc.pojo.UPSComm; import com.whyc.service.UPSCommService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -13,20 +12,20 @@ import org.springframework.web.bind.annotation.RestController; /** * UPS状态 * UPS通讯 */ @RequestMapping("UPS") @RequestMapping("UPSComm") @RestController @Api(tags = "UPS状态") @Api(tags = "UPS通讯") @Slf4j public class UPSController { public class UPSCommController { @Autowired private UPSService service; private UPSCommService service; @GetMapping("status") @ApiOperation(value = "获取UPS状态") public Response<UPS> getStatus(){ public Response<UPSComm> getStatus(){ return service.getStauts(); } src/main/java/com/whyc/controller/WaterCommController.java
New file @@ -0,0 +1,42 @@ package com.whyc.controller; import com.whyc.dto.Response; import com.whyc.pojo.WaterComm; import com.whyc.service.WaterCommService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * Water通讯 */ @RequestMapping("WaterComm") @RestController @Api(tags = "Water通讯") @Slf4j public class WaterCommController { @Autowired private WaterCommService service; @GetMapping("all") @ApiOperation(value = "获取所有Water信息") public Response<List<WaterComm>> getAll(){ return service.getAll(); } @GetMapping("infoByDevId") @ApiOperation(value = "根据设备id获取Water信息") public Response<WaterComm> getInfoByDevId(@RequestParam int devId){ return service.getInfoByDevId(devId); } } src/main/java/com/whyc/dto/Response.java
@@ -33,6 +33,11 @@ return this; } public Response<T> set(Integer code) { this.code = code; return this; } public Integer getCode() { return code; } src/main/java/com/whyc/mapper/OilCommMapper.java
New file @@ -0,0 +1,11 @@ package com.whyc.mapper; import com.whyc.pojo.OilComm; /** * Oil通讯 */ public interface OilCommMapper extends CustomMapper<OilComm> { } src/main/java/com/whyc/mapper/UPSCommMapper.java
New file @@ -0,0 +1,11 @@ package com.whyc.mapper; import com.whyc.pojo.UPSComm; /** * UPS通讯 */ public interface UPSCommMapper extends CustomMapper<UPSComm> { } src/main/java/com/whyc/mapper/UPSMapper.java
File was deleted src/main/java/com/whyc/mapper/WaterCommMapper.java
New file @@ -0,0 +1,11 @@ package com.whyc.mapper; import com.whyc.pojo.WaterComm; /** * Water通讯 */ public interface WaterCommMapper extends CustomMapper<WaterComm> { } src/main/java/com/whyc/pojo/OilComm.java
New file @@ -0,0 +1,247 @@ package com.whyc.pojo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.ibatis.type.Alias; import java.util.Date; @ApiModel @Alias("OilComm") @TableName( schema = "`db_3.5mw_motor`",value = "tb_oil_comm") public class OilComm { Long num; Integer devId; Date recordTime; @ApiModelProperty(value = "油站运行") Integer oilState; @ApiModelProperty(value = "油站高油温报警") @TableField("oil_highTmp") Integer oilHighTmp; @ApiModelProperty(value = "油站低液位报警") @TableField("oil_lowLevel") Integer oilLowLevel; @ApiModelProperty(value = "油站高液位报警") @TableField("oil_highLevel") Integer oilHighLevel; @ApiModelProperty(value = "油站电机1故障") @TableField("oil_eleMachine1") Integer oilEleMachine1; @ApiModelProperty(value = "油站电机1故障") @TableField("oil_eleMachine2") Integer oilEleMachine2; @ApiModelProperty(value = "油站回油温度") @TableField("oil_returnTmp") Float oilReturnTmp; @ApiModelProperty(value = "润滑油出口流量") @TableField("oil_highTmp") Float oilOutFlow; @ApiModelProperty(value = "润滑油压力1") Float oilPre1; @ApiModelProperty(value = "润滑油压力2") Float oilPre2; @ApiModelProperty(value = "油站出口1压力") @TableField("oil_outpre1") Float oilOutPre1; @ApiModelProperty(value = "油站出口2压力") @TableField("oil_outpre2") Float oilOutPre2; @ApiModelProperty(value = "油站出口3压力") @TableField("oil_outpre3") Float oilOutPre3; @ApiModelProperty(value = "油站出口4压力") @TableField("oil_outpre4") Float oilOutPre4; @ApiModelProperty(value = "润滑油回油流量") @TableField("oil_returnFlow") Float oilReturnFlow; @ApiModelProperty(value = "油站冷却水压力") @TableField("oil_coolpre") Float oilCoolPre; @ApiModelProperty(value = "油站冷却水回水温度") @TableField("oil_coolTmp") Float oilCoolTmp; @ApiModelProperty(value = "油站出油温度") @TableField("oil_outTmp") Float oilOutTmp; String note; public Long getNum() { return num; } public void setNum(Long num) { this.num = num; } public Integer getDevId() { return devId; } public void setDevId(Integer devId) { this.devId = devId; } public Date getRecordTime() { return recordTime; } public void setRecordTime(Date recordTime) { this.recordTime = recordTime; } public Integer getOilState() { return oilState; } public void setOilState(Integer oilState) { this.oilState = oilState; } public Integer getOilHighTmp() { return oilHighTmp; } public void setOilHighTmp(Integer oilHighTmp) { this.oilHighTmp = oilHighTmp; } public Integer getOilLowLevel() { return oilLowLevel; } public void setOilLowLevel(Integer oilLowLevel) { this.oilLowLevel = oilLowLevel; } public Integer getOilHighLevel() { return oilHighLevel; } public void setOilHighLevel(Integer oilHighLevel) { this.oilHighLevel = oilHighLevel; } public Integer getOilEleMachine1() { return oilEleMachine1; } public void setOilEleMachine1(Integer oilEleMachine1) { this.oilEleMachine1 = oilEleMachine1; } public Integer getOilEleMachine2() { return oilEleMachine2; } public void setOilEleMachine2(Integer oilEleMachine2) { this.oilEleMachine2 = oilEleMachine2; } public Float getOilReturnTmp() { return oilReturnTmp; } public void setOilReturnTmp(Float oilReturnTmp) { this.oilReturnTmp = oilReturnTmp; } public Float getOilOutFlow() { return oilOutFlow; } public void setOilOutFlow(Float oilOutFlow) { this.oilOutFlow = oilOutFlow; } public Float getOilPre1() { return oilPre1; } public void setOilPre1(Float oilPre1) { this.oilPre1 = oilPre1; } public Float getOilPre2() { return oilPre2; } public void setOilPre2(Float oilPre2) { this.oilPre2 = oilPre2; } public Float getOilOutPre1() { return oilOutPre1; } public void setOilOutPre1(Float oilOutPre1) { this.oilOutPre1 = oilOutPre1; } public Float getOilOutPre2() { return oilOutPre2; } public void setOilOutPre2(Float oilOutPre2) { this.oilOutPre2 = oilOutPre2; } public Float getOilOutPre3() { return oilOutPre3; } public void setOilOutPre3(Float oilOutPre3) { this.oilOutPre3 = oilOutPre3; } public Float getOilOutPre4() { return oilOutPre4; } public void setOilOutPre4(Float oilOutPre4) { this.oilOutPre4 = oilOutPre4; } public Float getOilReturnFlow() { return oilReturnFlow; } public void setOilReturnFlow(Float oilReturnFlow) { this.oilReturnFlow = oilReturnFlow; } public Float getOilCoolPre() { return oilCoolPre; } public void setOilCoolPre(Float oilCoolPre) { this.oilCoolPre = oilCoolPre; } public Float getOilCoolTmp() { return oilCoolTmp; } public void setOilCoolTmp(Float oilCoolTmp) { this.oilCoolTmp = oilCoolTmp; } public Float getOilOutTmp() { return oilOutTmp; } public void setOilOutTmp(Float oilOutTmp) { this.oilOutTmp = oilOutTmp; } public String getNote() { return note; } public void setNote(String note) { this.note = note; } } src/main/java/com/whyc/pojo/UPSComm.java
File was renamed from src/main/java/com/whyc/pojo/UPS.java @@ -10,12 +10,12 @@ import java.util.Date; /** * UPS状态 * UPS通讯 */ @ApiModel(value = "UPS") @Alias("UPS") @ApiModel(value = "UPSComm") @Alias("UPSComm") @TableName( schema = "`db_3.5mw_motor`",value = "tb_ups_comm") public class UPS { public class UPSComm { private Long num; private Integer devId; // 设备id src/main/java/com/whyc/pojo/WaterComm.java
New file @@ -0,0 +1,256 @@ package com.whyc.pojo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.ibatis.type.Alias; import java.util.Date; @ApiModel @Alias("WaterComm") @TableName( schema = "`db_3.5mw_motor`",value = "tb_water_comm") public class WaterComm { Long num; Integer devId; Date recordTime ; @ApiModelProperty(value = "水站运行") Integer waterState ; @ApiModelProperty(value = "水站高油温报警") @TableField("water_highTmp") Integer waterHighTmp; @ApiModelProperty(value = "水站低液位报警") @TableField("water_lowLevel") Integer waterLowLevel; @ApiModelProperty(value = "水站高液位报警") @TableField("water_highLevel") Integer waterHighLevel; @ApiModelProperty(value = "水站电机1故障") @TableField("water_eleMachine1") Integer waterEleMachine1; @ApiModelProperty(value = "水站电机1故障") @TableField("water_eleMachine2") Integer waterEleMachine2; @ApiModelProperty(value = "水站回油温度") @TableField("water_returnTmp") Float waterReturnTmp; @ApiModelProperty(value = "冷冻水出口流量") @TableField("water_outFlow") Float waterOutFlow; @ApiModelProperty(value = "冷冻水压力1") Float waterPre1; @ApiModelProperty(value = "冷冻水压力2") Float waterPre2; @ApiModelProperty(value = "水站出口1压力") @TableField("water_outpre1") Float waterOutPre1; @ApiModelProperty(value = "水站出口2压力") @TableField("water_outpre2") Float waterOutPre2; @ApiModelProperty(value = "水站出口3压力") @TableField("water_outpre3") Float waterOutPre3; @ApiModelProperty(value = "水站出口4压力") @TableField("water_outpre4") Float waterOutPre4; @ApiModelProperty(value = "冷冻水回油流量") @TableField("water_returnFlow") Float waterReturnFlow; @ApiModelProperty(value = "水站冷却水压力") @TableField("water_coolpre") Float waterCoolPre; @ApiModelProperty(value = "水站冷却水回水温度") @TableField("water_coolTmp") Float waterCoolTmp; @ApiModelProperty(value = "水站出油温度") @TableField("water_outTmp") Float waterOutTmp; @ApiModelProperty(value = "压缩机状态") Float compressorState; String note; public Long getNum() { return num; } public void setNum(Long num) { this.num = num; } public Integer getDevId() { return devId; } public void setDevId(Integer devId) { this.devId = devId; } public Date getRecordTime() { return recordTime; } public void setRecordTime(Date recordTime) { this.recordTime = recordTime; } public Integer getWaterState() { return waterState; } public void setWaterState(Integer waterState) { this.waterState = waterState; } public Integer getWaterHighTmp() { return waterHighTmp; } public void setWaterHighTmp(Integer waterHighTmp) { this.waterHighTmp = waterHighTmp; } public Integer getWaterLowLevel() { return waterLowLevel; } public void setWaterLowLevel(Integer waterLowLevel) { this.waterLowLevel = waterLowLevel; } public Integer getWaterHighLevel() { return waterHighLevel; } public void setWaterHighLevel(Integer waterHighLevel) { this.waterHighLevel = waterHighLevel; } public Integer getWaterEleMachine1() { return waterEleMachine1; } public void setWaterEleMachine1(Integer waterEleMachine1) { this.waterEleMachine1 = waterEleMachine1; } public Integer getWaterEleMachine2() { return waterEleMachine2; } public void setWaterEleMachine2(Integer waterEleMachine2) { this.waterEleMachine2 = waterEleMachine2; } public Float getWaterReturnTmp() { return waterReturnTmp; } public void setWaterReturnTmp(Float waterReturnTmp) { this.waterReturnTmp = waterReturnTmp; } public Float getWaterOutFlow() { return waterOutFlow; } public void setWaterOutFlow(Float waterOutFlow) { this.waterOutFlow = waterOutFlow; } public Float getWaterPre1() { return waterPre1; } public void setWaterPre1(Float waterPre1) { this.waterPre1 = waterPre1; } public Float getWaterPre2() { return waterPre2; } public void setWaterPre2(Float waterPre2) { this.waterPre2 = waterPre2; } public Float getWaterOutPre1() { return waterOutPre1; } public void setWaterOutPre1(Float waterOutPre1) { this.waterOutPre1 = waterOutPre1; } public Float getWaterOutPre2() { return waterOutPre2; } public void setWaterOutPre2(Float waterOutPre2) { this.waterOutPre2 = waterOutPre2; } public Float getWaterOutPre3() { return waterOutPre3; } public void setWaterOutPre3(Float waterOutPre3) { this.waterOutPre3 = waterOutPre3; } public Float getWaterOutPre4() { return waterOutPre4; } public void setWaterOutPre4(Float waterOutPre4) { this.waterOutPre4 = waterOutPre4; } public Float getWaterReturnFlow() { return waterReturnFlow; } public void setWaterReturnFlow(Float waterReturnFlow) { this.waterReturnFlow = waterReturnFlow; } public Float getWaterCoolPre() { return waterCoolPre; } public void setWaterCoolPre(Float waterCoolPre) { this.waterCoolPre = waterCoolPre; } public Float getWaterCoolTmp() { return waterCoolTmp; } public void setWaterCoolTmp(Float waterCoolTmp) { this.waterCoolTmp = waterCoolTmp; } public Float getWaterOutTmp() { return waterOutTmp; } public void setWaterOutTmp(Float waterOutTmp) { this.waterOutTmp = waterOutTmp; } public Float getCompressorState() { return compressorState; } public void setCompressorState(Float compressorState) { this.compressorState = compressorState; } public String getNote() { return note; } public void setNote(String note) { this.note = note; } } src/main/java/com/whyc/service/OilCommService.java
New file @@ -0,0 +1,44 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.dto.Response; import com.whyc.mapper.OilCommMapper; import com.whyc.pojo.OilComm; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; /** * Oil通讯 */ @Service public class OilCommService { @Resource private OilCommMapper mapper; public Response<List<OilComm>> getAll() { try { List<OilComm> Oils = mapper.selectList(null); return new Response<List<OilComm>>().set(1,Oils); } catch (Exception e) { e.printStackTrace(); return new Response().setCode(0); } } public Response<OilComm> getInfoByDevId(int devId) { try{ QueryWrapper<OilComm> queryWrapper = Wrappers.query(); queryWrapper.eq("dev_id",devId); OilComm oilComm = mapper.selectOne(queryWrapper); return new Response<OilComm>().set(1,oilComm); }catch (Exception e){ e.printStackTrace(); return new Response<OilComm>().setCode(0); } } } src/main/java/com/whyc/service/UPSCommService.java
File was renamed from src/main/java/com/whyc/service/UPSService.java @@ -1,24 +1,24 @@ package com.whyc.service; import com.whyc.dto.Response; import com.whyc.mapper.UPSMapper; import com.whyc.pojo.UPS; import com.whyc.mapper.UPSCommMapper; import com.whyc.pojo.UPSComm; import org.springframework.stereotype.Service; import javax.annotation.Resource; /** * UPS状态 * UPS通讯 */ @Service public class UPSService { public class UPSCommService { @Resource private UPSMapper mapper; private UPSCommMapper mapper; public Response getStauts() { try { UPS ups = mapper.selectOne(null); UPSComm ups = mapper.selectOne(null); return new Response().set(1,ups); } catch (Exception e) { e.printStackTrace(); src/main/java/com/whyc/service/WaterCommService.java
New file @@ -0,0 +1,44 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.dto.Response; import com.whyc.mapper.WaterCommMapper; import com.whyc.pojo.WaterComm; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; /** * Water通讯 */ @Service public class WaterCommService { @Resource private WaterCommMapper mapper; public Response<List<WaterComm>> getAll() { try { List<WaterComm> Waters = mapper.selectList(null); return new Response<List<WaterComm>>().set(1,Waters); } catch (Exception e) { e.printStackTrace(); return new Response().setCode(0); } } public Response<WaterComm> getInfoByDevId(int devId) { try{ QueryWrapper<WaterComm> queryWrapper = Wrappers.query(); queryWrapper.eq("dev_id",devId); WaterComm WaterComm = mapper.selectOne(queryWrapper); return new Response<WaterComm>().set(1,WaterComm); }catch (Exception e){ e.printStackTrace(); return new Response<WaterComm>().setCode(0); } } } src/main/java/com/whyc/swagger/SwaggerConfig4Knife.java
@@ -1,6 +1,7 @@ package com.whyc.swagger; import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; @@ -14,6 +15,7 @@ @Configuration @EnableSwagger2 @EnableKnife4j @ConditionalOnProperty(prefix = "knife",name = "enable",havingValue = "true") public class SwaggerConfig4Knife { @Bean src/main/resources/config/application.yml
@@ -54,11 +54,6 @@ # type: None # auth-regex: none # base-package: com.whyc.controller #knife4j: # enable: true ## production: true ## cors: true # setting: # enableSwaggerModels: true # enableDocumentManage: true # swaggerModelName: 实体类列表 knife: enable: true # enable: fase