暂降治理一期工作内容
This commit is contained in:
@@ -0,0 +1,84 @@
|
||||
package com.njcn.advance.controller.govern.harmonic;
|
||||
|
||||
|
||||
import cn.afterturn.easypoi.excel.ExcelImportUtil;
|
||||
import cn.afterturn.easypoi.excel.entity.ImportParams;
|
||||
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.njcn.advance.enums.AdvanceResponseEnum;
|
||||
import com.njcn.advance.pojo.dto.govern.voltage.SgEventExcel;
|
||||
import com.njcn.advance.pojo.po.govern.harmonic.SgHarmonicFile;
|
||||
import com.njcn.advance.service.govern.harmonic.ISgHarmonicFileService;
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.constant.OperateType;
|
||||
import com.njcn.common.pojo.enums.common.DataStateEnum;
|
||||
import com.njcn.common.pojo.enums.common.LogEnum;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.common.utils.HttpResultUtil;
|
||||
import com.njcn.oss.constant.OssPath;
|
||||
import com.njcn.oss.utils.FileStorageUtil;
|
||||
import com.njcn.poi.util.PoiUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author hongawen
|
||||
* @since 2024-04-17
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/sgHarmonic")
|
||||
@Api(tags = "暂降治理评估控制器")
|
||||
@RequiredArgsConstructor
|
||||
public class SgHarmonicFileController extends BaseController {
|
||||
|
||||
private final FileStorageUtil fileStorageUtil;
|
||||
private final ISgHarmonicFileService harmonicFileService;
|
||||
|
||||
@PostMapping(value = "/importHarmonicData")
|
||||
@ApiOperation("上传谐波数据文件")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
public HttpResult<String> importHarmonicData(@RequestParam("file") MultipartFile file, @RequestParam("name") String name) {
|
||||
String methodDescribe = getMethodDescribe("importHarmonicData");
|
||||
String filePath = fileStorageUtil.uploadMultipart(file, OssPath.GOVERN_HARMONIC_FILE);
|
||||
SgHarmonicFile sgHarmonicFile = new SgHarmonicFile();
|
||||
sgHarmonicFile.setDataName(name);
|
||||
sgHarmonicFile.setDataPath(filePath);
|
||||
sgHarmonicFile.setState(DataStateEnum.ENABLE.getCode());
|
||||
harmonicFileService.save(sgHarmonicFile);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping(value = "/listHarmonicData")
|
||||
@ApiOperation("获取谐波数据数据")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.QUERY)
|
||||
public HttpResult<List<SgHarmonicFile>> listHarmonicData() {
|
||||
String methodDescribe = getMethodDescribe("listHarmonicData");
|
||||
LambdaQueryWrapper<SgHarmonicFile> sgHarmonicFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
sgHarmonicFileLambdaQueryWrapper.eq(SgHarmonicFile::getState,DataStateEnum.ENABLE.getCode());
|
||||
List<SgHarmonicFile> files = harmonicFileService.list(sgHarmonicFileLambdaQueryWrapper);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, files, methodDescribe);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.njcn.advance.controller.govern.voltage;
|
||||
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.advance.pojo.param.govern.voltage.SgGovernSchemeHistoryParam;
|
||||
import com.njcn.advance.pojo.param.govern.voltage.SgUserParam;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgGovernSchemeHistoryAllVO;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgGovernSchemeHistoryVO;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgUserVO;
|
||||
import com.njcn.advance.service.govern.voltage.IGovernSchemeCalcService;
|
||||
import com.njcn.advance.service.govern.voltage.ISgGovernSchemeHistoryService;
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.constant.OperateType;
|
||||
import com.njcn.common.pojo.enums.common.LogEnum;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.common.utils.HttpResultUtil;
|
||||
import com.njcn.common.utils.LogUtil;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Validated
|
||||
@RestController
|
||||
@Api(tags = "暂降治理评估控制器")
|
||||
@RequestMapping("/sagGovernScheme")
|
||||
@RequiredArgsConstructor
|
||||
public class SagGovernSchemeController extends BaseController {
|
||||
|
||||
private final IGovernSchemeCalcService governSchemeCalcService;
|
||||
|
||||
private final ISgGovernSchemeHistoryService sgGovernSchemeHistoryService;
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/calc")
|
||||
@ApiOperation("根据治理参数,进行暂降治理评估")
|
||||
@ApiImplicitParam(name = "sgGovernSchemeHistoryParam", value = "计算参数", required = true)
|
||||
public HttpResult<SgGovernSchemeHistoryAllVO> calc(@RequestBody SgGovernSchemeHistoryParam sgGovernSchemeHistoryParam ) {
|
||||
String methodDescribe = getMethodDescribe("calc");
|
||||
LogUtil.njcnDebug(log, "{},查询数据为:{}", methodDescribe, sgGovernSchemeHistoryParam);
|
||||
SgGovernSchemeHistoryAllVO sgGovernSchemeHistoryAllVO = governSchemeCalcService.calc(sgGovernSchemeHistoryParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, sgGovernSchemeHistoryAllVO, methodDescribe);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/list")
|
||||
@ApiOperation("查询历史治理方案")
|
||||
@ApiImplicitParam(name = "SgSchemeHistoryQueryParam", value = "查询参数", required = true)
|
||||
public HttpResult<Page<SgGovernSchemeHistoryVO>> list(@RequestBody SgGovernSchemeHistoryParam.SgSchemeHistoryQueryParam sgSchemeHistoryQueryParam) {
|
||||
String methodDescribe = getMethodDescribe("list");
|
||||
LogUtil.njcnDebug(log, "{},查询数据为:{}", methodDescribe, sgSchemeHistoryQueryParam);
|
||||
Page<SgGovernSchemeHistoryVO> result = sgGovernSchemeHistoryService.schemeHistoryList(sgSchemeHistoryQueryParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
|
||||
@PostMapping("/delete")
|
||||
@ApiOperation("删除治理方案")
|
||||
@ApiImplicitParam(name = "ids", value = "治理方案索引", required = true, dataTypeClass = List.class)
|
||||
public HttpResult<Object> delete(@RequestBody List<String> ids) {
|
||||
String methodDescribe = getMethodDescribe("delete");
|
||||
LogUtil.njcnDebug(log, "{},业务用户ID数据为:{}", methodDescribe, String.join(StrUtil.COMMA, ids));
|
||||
boolean result = sgGovernSchemeHistoryService.deleteScheme(ids);
|
||||
if (result) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
} else {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
|
||||
}
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@GetMapping("/detail")
|
||||
@ApiOperation("根据治理方案索引,查询详细数据回显")
|
||||
public HttpResult<SgGovernSchemeHistoryAllVO> detail(String id) {
|
||||
String methodDescribe = getMethodDescribe("detail");
|
||||
LogUtil.njcnDebug(log, "{},治理方案索引为:{}", methodDescribe, id);
|
||||
SgGovernSchemeHistoryAllVO sgGovernSchemeHistoryAllVO = governSchemeCalcService.detail(id);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, sgGovernSchemeHistoryAllVO, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,34 +1,43 @@
|
||||
package com.njcn.advance.controller.govern.voltage;
|
||||
|
||||
|
||||
import cn.afterturn.easypoi.excel.ExcelImportUtil;
|
||||
import cn.afterturn.easypoi.excel.entity.ImportParams;
|
||||
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.advance.enums.AdvanceResponseEnum;
|
||||
import com.njcn.advance.pojo.dto.govern.voltage.SgEventExcel;
|
||||
import com.njcn.advance.pojo.param.govern.voltage.SgEventParam;
|
||||
import com.njcn.advance.pojo.param.govern.voltage.SgUserParam;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgEventVO;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgUserVO;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.TransientEventCountVO;
|
||||
import com.njcn.advance.service.govern.voltage.ISgEventService;
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.constant.OperateType;
|
||||
import com.njcn.common.pojo.enums.common.LogEnum;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.common.utils.HttpResultUtil;
|
||||
import com.njcn.common.utils.LogUtil;
|
||||
import com.njcn.poi.util.PoiUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 前端控制器
|
||||
* 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author hongawen
|
||||
@@ -38,7 +47,7 @@ import com.njcn.web.controller.BaseController;
|
||||
@Validated
|
||||
@RestController
|
||||
@Api(tags = "暂降治理暂降数据控制器")
|
||||
@RequestMapping("/voltage/sgEvent")
|
||||
@RequestMapping("/sgEvent")
|
||||
@RequiredArgsConstructor
|
||||
public class SgEventController extends BaseController {
|
||||
|
||||
@@ -55,9 +64,97 @@ public class SgEventController extends BaseController {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/getEventDataByProductLineId")
|
||||
@ApiOperation("查询生产线下时间范围内的暂降数据")
|
||||
@ApiImplicitParam(name = "sgEventParamQueryParam", value = "查询参数", required = true)
|
||||
public HttpResult<List<SgEventVO>> getEventDataByProductLineId(@RequestBody SgEventParam.SgEventParamQueryParam sgEventParamQueryParam) {
|
||||
String methodDescribe = getMethodDescribe("getEventDataByProductLineId");
|
||||
LogUtil.njcnDebug(log, "{},查询数据为:{}", methodDescribe, sgEventParamQueryParam);
|
||||
List<SgEventVO> result = sgEventService.getEventDataByProductLineId(sgEventParamQueryParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@GetMapping("/downloadTemplate")
|
||||
@ApiOperation("下载暂降事件模板")
|
||||
public void downloadTemplate() {
|
||||
sgEventService.downloadTemplate();
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/exportEventData")
|
||||
@ApiOperation("导出暂降数据")
|
||||
@ApiImplicitParam(name = "sgEventParamQueryParam", value = "查询参数", required = true)
|
||||
public void exportEventData(@RequestBody SgEventParam.SgEventParamQueryParam sgEventParamQueryParam) {
|
||||
sgEventService.exportEventData(sgEventParamQueryParam);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/3DList")
|
||||
@ApiOperation("获取3d数据")
|
||||
@ApiImplicitParam(name = "sgEventParamQueryParam", value = "查询参数", required = true)
|
||||
public HttpResult<TransientEventCountVO> threeDList(@RequestBody SgEventParam.SgEventParamQueryParam sgEventParamQueryParam) {
|
||||
String methodDescribe = getMethodDescribe("threeDList");
|
||||
TransientEventCountVO result = sgEventService.threeDList(sgEventParamQueryParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping(value = "/importEventData")
|
||||
@ApiOperation("批量导入暂降数据")
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
public HttpResult<String> importEventData(@RequestParam("file") MultipartFile file, @RequestParam("incomingLineId") String incomingLineId, @RequestParam("productLineId") String productLineId,HttpServletResponse response) {
|
||||
String methodDescribe = getMethodDescribe("importEventData");
|
||||
ImportParams params = new ImportParams();
|
||||
params.setHeadRows(1);
|
||||
params.setNeedVerify(true);
|
||||
params.setStartSheetIndex(0);
|
||||
params.setSheetNum(1);
|
||||
try {
|
||||
ExcelImportResult<SgEventExcel> sgEventExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SgEventExcel.class, params);
|
||||
//如果存在非法数据,将不合格的数据导出
|
||||
if (sgEventExcelExcelImportResult.isVerifyFail()) {
|
||||
// PoiUtil.exportFileByWorkbook(sgEventExcelExcelImportResult.getFailWorkbook(), "非法暂降数据.xlsx", response);
|
||||
throw new BusinessException(AdvanceResponseEnum.IMPORT_EVENT_DATA_FAIL);
|
||||
} else {
|
||||
//批量录入暂降数据
|
||||
List<SgEventExcel> sgEventExcels = sgEventExcelExcelImportResult.getList();
|
||||
sgEventService.importEventData(sgEventExcels, incomingLineId,productLineId);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new BusinessException(AdvanceResponseEnum.IMPORT_EVENT_DATA_FAIL);
|
||||
}
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@GetMapping("/calcLoss")
|
||||
@ApiOperation("计算暂降损失")
|
||||
public HttpResult<String> calcLoss(String id) {
|
||||
String methodDescribe = getMethodDescribe("calcLoss");
|
||||
LogUtil.njcnDebug(log, "{},暂降事件ID数据为:{}", methodDescribe, id);
|
||||
sgEventService.calcLoss(id);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
|
||||
@PostMapping("/delete")
|
||||
@ApiOperation("删除暂降事件")
|
||||
@ApiImplicitParam(name = "ids", value = "暂降事件索引", required = true, dataTypeClass = List.class)
|
||||
public HttpResult<Object> delete(@RequestBody List<String> ids) {
|
||||
String methodDescribe = getMethodDescribe("delete");
|
||||
LogUtil.njcnDebug(log, "{},暂降事件ID数据为:{}", methodDescribe, String.join(StrUtil.COMMA, ids));
|
||||
boolean result = sgEventService.deleteEventData(ids);
|
||||
if (result) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
} else {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ package com.njcn.advance.controller.govern.voltage;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.njcn.advance.pojo.param.govern.voltage.IncomingLineParam;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.IncomingLineVO;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgOption;
|
||||
import com.njcn.advance.service.govern.voltage.ISgIncomingLineService;
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.constant.OperateType;
|
||||
@@ -52,6 +53,16 @@ public class SgIncomingLineController extends BaseController {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@GetMapping("/lineList")
|
||||
@ApiOperation("查询监测点数据")
|
||||
public HttpResult<List<SgOption>> lineList( ) {
|
||||
String methodDescribe = getMethodDescribe("lineList");
|
||||
LogUtil.njcnDebug(log, "{}", methodDescribe);
|
||||
List<SgOption> result = sgIncomingLineService.lineList();
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
@PostMapping("/add")
|
||||
|
||||
@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.advance.pojo.param.govern.voltage.SgMachineParam;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgMachineVO;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgProductLineVO;
|
||||
import com.njcn.advance.service.govern.voltage.ISgMachineService;
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.constant.OperateType;
|
||||
@@ -19,11 +20,8 @@ import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
|
||||
import java.util.List;
|
||||
@@ -58,6 +56,17 @@ public class SgMachineController extends BaseController {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@GetMapping("/querySgMachineByProductLineId")
|
||||
@ApiOperation("根据生产线id查询所有的设备信息")
|
||||
@ApiImplicitParam(name = "productId", value = "生产线Id", required = true)
|
||||
public HttpResult<List<SgMachineVO>> querySgMachineByProductLineId(String productId) {
|
||||
String methodDescribe = getMethodDescribe("querySgMachineByProductLineId");
|
||||
LogUtil.njcnDebug(log, "{},查询数据为:{}", methodDescribe, productId);
|
||||
List<SgMachineVO> result = sgMachineService.listAllMachineByProductLineId(productId);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
@PostMapping("/add")
|
||||
|
||||
@@ -60,10 +60,10 @@ public class SgProductLineController extends BaseController {
|
||||
@GetMapping("/querySgProductLineByUserId")
|
||||
@ApiOperation("根据用户id查询所有的生产线信息")
|
||||
@ApiImplicitParam(name = "userId", value = "用户id", required = true)
|
||||
public HttpResult<List<SgProductLine>> querySgProductLineByUserId(String userId) {
|
||||
public HttpResult<List<SgProductLineVO>> querySgProductLineByUserId(String userId) {
|
||||
String methodDescribe = getMethodDescribe("querySgProductLineByUserId");
|
||||
LogUtil.njcnDebug(log, "{},查询数据为:{}", methodDescribe, userId);
|
||||
List<SgProductLine> result = sgProductLineService.querySgProductLineByUserId(userId);
|
||||
List<SgProductLineVO> result = sgProductLineService.querySgProductLineByUserId(userId);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ package com.njcn.advance.controller.govern.voltage;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.advance.pojo.param.govern.voltage.SgSensitiveUnitParam;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgMachineVO;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgSensitiveUnitVO;
|
||||
import com.njcn.advance.service.govern.voltage.ISgSensitiveUnitService;
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
@@ -19,11 +20,8 @@ import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
|
||||
import java.util.List;
|
||||
@@ -58,6 +56,18 @@ public class SgSensitiveUnitController extends BaseController {
|
||||
}
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@GetMapping("/queryUnitByMachineId")
|
||||
@ApiOperation("根据设备id查询所有的元器件信息")
|
||||
@ApiImplicitParam(name = "machineId", value = "设备id", required = true)
|
||||
public HttpResult<List<SgSensitiveUnitVO>> queryUnitByMachineId(String machineId) {
|
||||
String methodDescribe = getMethodDescribe("queryUnitByMachineId");
|
||||
LogUtil.njcnDebug(log, "{},查询数据为:{}", methodDescribe, machineId);
|
||||
List<SgSensitiveUnitVO> result = sgSensitiveUnitService.listAllUnitByMachineId(machineId);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
@PostMapping("/add")
|
||||
@ApiOperation("新增元器件")
|
||||
@@ -74,6 +84,8 @@ public class SgSensitiveUnitController extends BaseController {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
@PostMapping("/update")
|
||||
@ApiOperation("更新元器件")
|
||||
|
||||
@@ -4,6 +4,7 @@ package com.njcn.advance.controller.govern.voltage;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.advance.pojo.param.govern.voltage.SgUserParam;
|
||||
import com.njcn.advance.pojo.po.govern.voltage.SgUser;
|
||||
import com.njcn.advance.pojo.vo.govern.voltage.SgUserVO;
|
||||
import com.njcn.advance.service.govern.voltage.ISgUserService;
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
@@ -19,11 +20,8 @@ import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
|
||||
import java.util.List;
|
||||
@@ -58,6 +56,18 @@ public class SgUserController extends BaseController {
|
||||
}
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@GetMapping("/sgUserList")
|
||||
@ApiOperation("查询所有的用户数据")
|
||||
public HttpResult<List<SgUser>> sgUserList() {
|
||||
String methodDescribe = getMethodDescribe("list");
|
||||
LogUtil.njcnDebug(log, "{},查询所有的用户数据", methodDescribe);
|
||||
List<SgUser> result = sgUserService.sgUserAllList();
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
@PostMapping("/add")
|
||||
@ApiOperation("新增业务用户")
|
||||
|
||||
Reference in New Issue
Block a user