户用光伏-运维工单分页详情接口调整

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HYGFMaintenanceTicketsDto.java

@@ -87,7 +87,7 @@ public class HYGFMaintenanceTicketsDto extends BaseDto {
      * 是否替换备件
      */
 
-    private String isReplaceSpareParts;
+    private Boolean isReplaceSpareParts =false;
     /**
      * 运维人员附件
      */

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HYGFMaintenanceTickets.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_maintenance_tickets")
+@TableName(value = "hygf_maintenance_tickets",autoResultMap = true)
 public class HYGFMaintenanceTickets extends BaseEntity {
     private static final long serialVersionUID = 1L;
     /**
@@ -100,7 +100,7 @@ public class HYGFMaintenanceTickets extends BaseEntity {
      * 是否替换备件
      */
     @TableField("is_repleace_spare_parts")
-    private String isReplaceSpareParts;
+    private Boolean isReplaceSpareParts =false;
     /**
      * 运维人员附件
      */

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HYGFMaintenanceTicketsController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HYGFMaintenanceTicketsDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HYGFMaintenanceTicketsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,15 +47,13 @@ public class HYGFMaintenanceTicketsController extends BaseController {
 	/**
      * 根据sequenceNbr更新
      *
-     * @param sequenceNbr 主键
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
+	@PostMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新运维工单", notes = "根据sequenceNbr更新运维工单")
-	public ResponseModel<HYGFMaintenanceTicketsDto> updateBySequenceNbrMaintenance(@RequestBody HYGFMaintenanceTicketsDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.updateWithModel(model));
+	public ResponseModel<HYGFMaintenanceTicketsDto> updateBySequenceNbrMaintenance(@RequestBody HYGFMaintenanceTicketsDto model) {
+	    return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.updateHYGFMaintenanceTicketsDto(model));
 	}
 
 	/**
@@ -76,11 +75,11 @@ public class HYGFMaintenanceTicketsController extends BaseController {
 	 * @param sequenceNbr  主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/getDeatil")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个运维工单",  notes = "根据sequenceNbr查询单个运维工单")
-	public ResponseModel<HYGFMaintenanceTicketsDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.queryBySeq(sequenceNbr));
+	public ResponseModel<HYGFMaintenanceTickets> selectOne(@RequestParam Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.getDetailBySequenceNbr(sequenceNbr));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/emqx/MaintenanceResultHandlerMessage.java

@@ -119,7 +119,7 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
 
             hygfMaintenanceTicketsMapper.insert(hygfMaintenanceTickets);
 
-            tdHygfJpInverterWarn.setHandlerStatus("未处理");
+            tdHygfJpInverterWarn.setHandlerStatus("处理中");
             tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
             log.info("创建运维工单成功{}", JSON.toJSONString(hygfMaintenanceTickets));
         }