ly 2 týždňov pred
rodič
commit
61a561fc81

+ 54 - 3
master/src/main/java/com/ruoyi/project/production/controller/TFurnancePressureController.java

@@ -54,6 +54,8 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Resource;
 
@@ -66,6 +68,9 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/production/pressure")
 public class TFurnancePressureController extends BaseController {
+    
+    private static final Logger logger = LoggerFactory.getLogger(TFurnancePressureController.class);
+    
     @Autowired
     private ITFurnancePressureService tFurnancePressureService;
 
@@ -422,6 +427,7 @@ public class TFurnancePressureController extends BaseController {
      */
     @GetMapping("/summary")
     public AjaxResult getPressureSummary() throws ParseException {
+        logger.info("开始执行裂解炉测压列表Summary接口");
         TFurnancePressure query = new TFurnancePressure();
         Date date = new Date();
         date.setHours(0);
@@ -430,7 +436,9 @@ public class TFurnancePressureController extends BaseController {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date parse = sdf.parse(sdf.format(date));
         query.setRecordTime(parse);
+        logger.debug("查询参数: recordTime={}", parse);
         List<TFurnancePressure> result = tFurnancePressureService.selectTFurnancePressureByDate(query);
+        logger.info("查询到原始数据条数: {}", result.size());
         List<TFurnancePressure> list = new ArrayList<>();
         List<FurnanceSummaryVO> voList = new ArrayList<>();
         double maxValue109 = 0;
@@ -564,6 +572,7 @@ public class TFurnancePressureController extends BaseController {
             }
             voList.add(vo);
         }
+        logger.info("裂解炉测压列表Summary接口执行完成,返回数据条数: {}", voList.size());
         return AjaxResult.success(voList);
     }
 
@@ -648,9 +657,11 @@ public class TFurnancePressureController extends BaseController {
      */
     @PostMapping("/uploadFile")
     public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, String pType, String pId) throws IOException {
+        logger.info("开始执行现场照片上传接口,文件名: {}, 类型: {}, ID: {}", file.getOriginalFilename(), pType, pId);
         if (!file.isEmpty()) {
             String url = FileUploadUtils.upload(RuoYiConfig.getFilePath("/" + pType), file);
             long size = file.getSize() / 1024;
+            logger.debug("文件上传成功,URL: {}, 大小: {}KB", url, size);
             TCommonfile tCommonfile = new TCommonfile();
             tCommonfile.setFileUrl(url);
             tCommonfile.setFileName(file.getOriginalFilename());
@@ -674,17 +685,21 @@ public class TFurnancePressureController extends BaseController {
     @PreAuthorize("@ss.hasPermi('production:pressure:list')")
     @PostMapping("/getFvpAnalysis")
     public AjaxResult getFvpAnalysis(@RequestBody FvpAnalysisQueryVO fvpAnalysisQueryVO) {
+        logger.info("开始执行获取裂解炉炉管测压fvp分析数据接口,炉管名称: {}, 记录时间: {}", 
+                   fvpAnalysisQueryVO.getFurnanceName(), fvpAnalysisQueryVO.getRecordTime());
         String furnanceName = fvpAnalysisQueryVO.getFurnanceName();
         furnanceName = furnanceName.replace("-", "").replace("A", "").replace("B", "");
         Date startDate = new Date(fvpAnalysisQueryVO.getRecordTime().getTime());
         startDate.setMonth(startDate.getMonth() - 3);
         Date endDate = new Date(fvpAnalysisQueryVO.getRecordTime().getTime());
         endDate.setDate(endDate.getDate() + 1);
+        logger.debug("查询时间范围: {} 到 {}", startDate, endDate);
         TFurnancePressure pressure = new TFurnancePressure();
         pressure.setFurnanceName(furnanceName);
         pressure.setStartDate(startDate);
         pressure.setEndDate(endDate);
         List<TFurnancePressure> tFurnancePressures = tFurnancePressureMapper.selectTFurnancePressureAnalysis(pressure);
+        logger.info("查询到分析数据条数: {}", tFurnancePressures.size());
         LinkedHashMap<Date, Double> resultMap = new LinkedHashMap<>();
         switch (fvpAnalysisQueryVO.getFurnanceName()) {
             case "H-110":
@@ -1197,9 +1212,11 @@ public class TFurnancePressureController extends BaseController {
     @PreAuthorize("@ss.hasPermi('production:pressure:list')")
     @PostMapping("/info")
     public AjaxResult getPressureInfo(@RequestBody TFurnancePressure tFurnancePressure) throws ParseException {
+        logger.info("开始执行获取裂解炉炉管测压详细信息接口,炉管名称: {}", tFurnancePressure.getFurnanceName());
         String furnanceName = tFurnancePressure.getFurnanceName();
         Date recordTime = new Date();
         if ("".equals(furnanceName) || recordTime == null) {
+            logger.warn("参数验证失败: furnanceName为空或recordTime为null");
             return AjaxResult.success();
         }
         Date date = new Date();
@@ -1216,9 +1233,13 @@ public class TFurnancePressureController extends BaseController {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date parse = sdf.parse(sdf.format(date));
         tFurnancePressure.setRecordTime(parse);
+        logger.debug("设置查询时间: {}", parse);
         List<TFurnancePressure> tFurnancePressures = tFurnancePressureService.selectTFurnancePressureByDate(tFurnancePressure);
         if (tFurnancePressures.size() == 0) {
+            logger.info("未查询到数据,开始生成新数据");
             tFurnancePressures = this.genData(tFurnancePressure);
+        } else {
+            logger.info("查询到现有数据条数: {}", tFurnancePressures.size());
         }
         TFurnancePressure am = new TFurnancePressure();
         TFurnancePressure pm = new TFurnancePressure();
@@ -3701,8 +3722,10 @@ public class TFurnancePressureController extends BaseController {
     @PreAuthorize("@ss.hasPermi('production:pressure:list')")
     @GetMapping("/list")
     public TableDataInfo list(TFurnancePressure tFurnancePressure) {
+        logger.info("开始执行查询裂解炉炉管测压列表接口,炉管名称: {}", tFurnancePressure.getFurnanceName());
         startPage();
         List<TFurnancePressure> list = tFurnancePressureService.selectTFurnancePressureList(tFurnancePressure);
+        logger.info("查询裂解炉炉管测压列表接口执行完成,返回数据条数: {}", list.size());
         return getDataTable(list);
     }
 
@@ -3713,8 +3736,11 @@ public class TFurnancePressureController extends BaseController {
     @Log(title = "裂解炉炉管测压", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TFurnancePressure tFurnancePressure) {
+        logger.info("开始执行导出裂解炉炉管测压列表接口,炉管名称: {}", tFurnancePressure.getFurnanceName());
         List<TFurnancePressure> list = tFurnancePressureService.selectTFurnancePressureList(tFurnancePressure);
+        logger.info("查询到导出数据条数: {}", list.size());
         ExcelUtil<TFurnancePressure> util = new ExcelUtil<TFurnancePressure>(TFurnancePressure.class);
+        logger.info("导出裂解炉炉管测压列表接口执行完成");
         return util.exportExcel(list, "pressure");
     }
 
@@ -3724,7 +3750,14 @@ public class TFurnancePressureController extends BaseController {
     @PreAuthorize("@ss.hasPermi('production:pressure:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tFurnancePressureService.selectTFurnancePressureById(id));
+        logger.info("开始执行获取裂解炉炉管测压详细信息接口,入参: id={}", id);
+        TFurnancePressure result = tFurnancePressureService.selectTFurnancePressureById(id);
+        if (result != null) {
+            logger.info("获取裂解炉炉管测压详细信息接口执行完成,返回数据ID: {}", result.getId());
+        } else {
+            logger.warn("未找到ID为{}的裂解炉炉管测压数据", id);
+        }
+        return AjaxResult.success(result);
     }
 
     /**
@@ -3734,7 +3767,15 @@ public class TFurnancePressureController extends BaseController {
     @Log(title = "裂解炉炉管测压", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TFurnancePressure tFurnancePressure) {
-        return toAjax(tFurnancePressureService.insertTFurnancePressure(tFurnancePressure));
+        logger.info("开始执行新增裂解炉炉管测压接口,炉管名称: {}, 记录时间: {}", 
+                   tFurnancePressure.getFurnanceName(), tFurnancePressure.getRecordTime());
+        int result = tFurnancePressureService.insertTFurnancePressure(tFurnancePressure);
+        if (result > 0) {
+            logger.info("新增裂解炉炉管测压接口执行完成,新增成功,影响行数: {}", result);
+        } else {
+            logger.warn("新增裂解炉炉管测压接口执行完成,新增失败");
+        }
+        return toAjax(result);
     }
 
     public boolean isNegativeOrNull(TFurnancePressure tFurnancePressure) {
@@ -3851,6 +3892,8 @@ public class TFurnancePressureController extends BaseController {
     @Log(title = "裂解炉炉管测压", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TFurnancePressure tFurnancePressure) throws PinyinException {
+        logger.info("开始执行修改裂解炉炉管测压接口(APP),入参: id={}, 炉管名称: {}, 记录时间: {}", 
+                   tFurnancePressure.getId(), tFurnancePressure.getFurnanceName(), tFurnancePressure.getRecordTime());
         String pass1 = tFurnancePressure.getPass1();
         String pass2 = tFurnancePressure.getPass2();
         String pass3 = tFurnancePressure.getPass3();
@@ -3868,6 +3911,7 @@ public class TFurnancePressureController extends BaseController {
         String pass15 = tFurnancePressure.getPass15();
         String pass16 = tFurnancePressure.getPass16();
         //更新
+        logger.debug("开始更新裂解炉炉管测压数据");
         tFurnancePressureService.updateTFurnancePressure(tFurnancePressure);
         //计算ratio
         TFurnancePressure pressure = tFurnancePressureService.selectTFurnancePressureById(tFurnancePressure.getId());
@@ -4173,6 +4217,13 @@ public class TFurnancePressureController extends BaseController {
     @Log(title = "裂解炉炉管测压", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(tFurnancePressureService.deleteTFurnancePressureByIds(ids));
+        logger.info("开始执行删除裂解炉炉管测压接口,删除ID数量: {}", ids.length);
+        int result = tFurnancePressureService.deleteTFurnancePressureByIds(ids);
+        if (result > 0) {
+            logger.info("删除裂解炉炉管测压接口执行完成,删除成功,影响行数: {}", result);
+        } else {
+            logger.warn("删除裂解炉炉管测压接口执行完成,删除失败");
+        }
+        return toAjax(result);
     }
 }