src/main/java/com/lxzn/common/Result.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/lxzn/modules/assembly2/controller/AssemblyCollectionJobController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/lxzn/common/Result.java
@@ -1,8 +1,6 @@ package com.lxzn.common; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -14,7 +12,6 @@ * @date 2019年1月19日 */ @Data @ApiModel(value = "接口返回对象", description = "接口返回对象") public class Result<T> implements Serializable { private static final long serialVersionUID = 1L; @@ -22,31 +19,26 @@ /** * 成功标志 */ @ApiModelProperty(value = "成功标志") private boolean success = true; /** * 返回处理消息 */ @ApiModelProperty(value = "返回处理消息") private String message = ""; /** * 返回代码 */ @ApiModelProperty(value = "返回代码") private Integer code = 0; /** * 返回数据对象 data */ @ApiModelProperty(value = "返回数据对象") private T result; /** * 时间戳 */ @ApiModelProperty(value = "时间戳") private long timestamp = System.currentTimeMillis(); public Result() { src/main/java/com/lxzn/modules/assembly2/controller/AssemblyCollectionJobController.java
@@ -3,8 +3,6 @@ import com.lxzn.common.Result; import com.lxzn.modules.assembly2.entity.TcOpstate; import com.lxzn.modules.assembly2.service.ITcOpstateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -12,14 +10,12 @@ import java.util.List; @Api(tags = "2号装配线采集") @RestController @RequestMapping("/assembly2/job") public class AssemblyCollectionJobController { @Autowired private ITcOpstateService tcOpstateService; @ApiOperation(value = "2号装配线采集-设备状态", notes = "2号装配线采集-设备状态") @GetMapping("/opstate") public Result<?> testOpStateList(){ List<TcOpstate> list = tcOpstateService.list();