From 6e13e0fa577df5511157a7841617106bd2f5c0b2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 20 三月 2023 16:03:05 +0800
Subject: [PATCH] 1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug
---
service-common/src/main/java/com/java110/common/cmd/machineType/ListMachineTypeCmd.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machineType/ListMachineTypeCmd.java b/service-common/src/main/java/com/java110/common/cmd/machineType/ListMachineTypeCmd.java
index da07773..15dec08 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machineType/ListMachineTypeCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machineType/ListMachineTypeCmd.java
@@ -26,13 +26,14 @@
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import com.java110.dto.machineType.MachineTypeDto;
+
import java.util.List;
import java.util.ArrayList;
+
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpStatus;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
-
/**
* 绫昏〃杩帮細鏌ヨ
@@ -47,7 +48,8 @@
@Java110Cmd(serviceCode = "machineType.listMachineType")
public class ListMachineTypeCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(ListMachineTypeCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(ListMachineTypeCmd.class);
+
@Autowired
private IMachineTypeV1InnerServiceSMO machineTypeV1InnerServiceSMOImpl;
@@ -59,22 +61,22 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- MachineTypeDto machineTypeDto = BeanConvertUtil.covertBean(reqJson, MachineTypeDto.class);
+ MachineTypeDto machineTypeDto = BeanConvertUtil.covertBean(reqJson, MachineTypeDto.class);
- int count = machineTypeV1InnerServiceSMOImpl.queryMachineTypesCount(machineTypeDto);
+ int count = machineTypeV1InnerServiceSMOImpl.queryMachineTypesCount(machineTypeDto);
- List<MachineTypeDto> machineTypeDtos = null;
+ List<MachineTypeDto> machineTypeDtos = null;
- if (count > 0) {
- machineTypeDtos = machineTypeV1InnerServiceSMOImpl.queryMachineTypes(machineTypeDto);
- } else {
- machineTypeDtos = new ArrayList<>();
- }
+ if (count > 0) {
+ machineTypeDtos = machineTypeV1InnerServiceSMOImpl.queryMachineTypes(machineTypeDto);
+ } else {
+ machineTypeDtos = new ArrayList<>();
+ }
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, machineTypeDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, machineTypeDtos);
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
- cmdDataFlowContext.setResponseEntity(responseEntity);
+ cmdDataFlowContext.setResponseEntity(responseEntity);
}
}
--
Gitblit v1.8.0