解决冲突

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

@@ -126,5 +126,16 @@ public class HYGFMaintenanceTicketsDto extends BaseDto {
      * 经销商orgcode
      */
     private String amosCompanyCode;
+    /**
+     * 工单类型
+     */
+    private String ticketType;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date taskStartTime;
+    /**
+     * 告警开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date taskEndTime;
 }

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

@@ -147,7 +147,17 @@ public class HYGFMaintenanceTickets extends BaseEntity {
      */
     @TableField("amos_company_code")
     private String amosCompanyCode;
+    @TableField("ticket_type")
+    private String ticketType;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("task_start_time")
+    private Date taskStartTime;
+    /**
+     * 告警开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("task_end_time")
+    private Date taskEndTime;
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HYGFMaintenanceTicketsMapper.java

@@ -2,6 +2,11 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 public interface HYGFMaintenanceTicketsMapper extends BaseMapper<HYGFMaintenanceTickets> {
+    @Select("SELECT sn_code FROM hygf_jp_inverter WHERE third_station_id = #{stationId}")
+    List<String> queryInverterSncodesByStationId(String stationId);
 }

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

@@ -112,4 +112,15 @@ public class HYGFMaintenanceTicketsController extends BaseController {
 	public ResponseModel<List<HYGFMaintenanceTicketsDto>> selectForList() {
 	    return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.queryHYGFMaintenanceTicketsDtoList());
 	}
+	/**
+	 * 列表全部数据查询
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "根据场站id获取sncode列表",   notes = "根据场站id获取sncode列表")
+	@GetMapping(value = "/queryInverterSncodesByStationId")
+	public ResponseModel<List<String>> queryInverterSncodesByStationId(@RequestParam(value = "stationId") String stationId){
+		return ResponseHelper.buildResponse(hygfMaintenanceTicketsServiceimpl.queryInverterSncodesByStationId(stationId));
+	}
 }

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

@@ -71,14 +71,14 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 specialMap = jsonObject.get("specialMap") == null ? null : jsonObject.getJSONObject("specialMap").toJavaObject(Map.class);
             }
             HYGFMaintenanceTickets hygfMaintenanceTickets = new HYGFMaintenanceTickets();
-            String stationid=specialMap.get("stationId") == null ? null : specialMap.get("stationId").toString();
-            Long warningId = Long.valueOf( specialMap.get("warningId").toString());
+            String stationid = specialMap.get("stationId") == null ? null : specialMap.get("stationId").toString();
+            Long warningId = Long.valueOf(specialMap.get("warningId").toString());
             String sncode = specialMap.get("inverterSncode").toString();
             String mantainancePersonId = specialMap.get("maintenancePersonId").toString();
             JpStation jpStation = jpStationMapper.selectOne(new QueryWrapper<JpStation>().eq("third_station_id", stationid));
-            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId,sncode,stationid);
+            TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId, sncode, stationid);
             hygfMaintenanceTickets.setHandlerStatus("未处理");
-            Maintenance maintenance = maintenanceMapper.selectOne(new QueryWrapper<Maintenance>().eq("sequence_nbr",mantainancePersonId));
+            Maintenance maintenance = maintenanceMapper.selectOne(new QueryWrapper<Maintenance>().eq("sequence_nbr", mantainancePersonId));
             hygfMaintenanceTickets.setStationId(stationid);
             hygfMaintenanceTickets.setWarningId(warningId);
             hygfMaintenanceTickets.setMaintenancePersonId(mantainancePersonId);
@@ -104,16 +104,21 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 //电站联系人
 //            hygfMaintenanceTickets.setStationContact();
             }
+            hygfMaintenanceTickets.setInverterSn(sncode);
+            hygfMaintenanceTickets.setWarningLevel(tdHygfJpInverterWarn.getLevel());
+            hygfMaintenanceTickets.setWarningContent(tdHygfJpInverterWarn.getContent());
+            hygfMaintenanceTickets.setWarningStatus(tdHygfJpInverterWarn.getState());
             if (ObjectUtil.isNotEmpty(tdHygfJpInverterWarn)) {
-                //snCode
-                hygfMaintenanceTickets.setInverterSn(sncode);
                 //告警等级
-                hygfMaintenanceTickets.setWarningLevel(tdHygfJpInverterWarn.getLevel());
-                hygfMaintenanceTickets.setWarningContent(tdHygfJpInverterWarn.getContent());
-                hygfMaintenanceTickets.setWarningStatus(tdHygfJpInverterWarn.getState());
                 hygfMaintenanceTickets.setWarningStartTime(new Date(tdHygfJpInverterWarn.getStartTime()));
+                hygfMaintenanceTickets.setTicketType("手动");
+                hygfMaintenanceTickets.setTaskStartTime((Date) specialMap.get("taskStartTime"));
+                hygfMaintenanceTickets.setTaskEndTime((Date) specialMap.get("taskEndTime"));
             }
+
+
             hygfMaintenanceTicketsMapper.insert(hygfMaintenanceTickets);
+
             tdHygfJpInverterWarn.setHandlerStatus("未处理");
             tdHygfJpInverterWarnMapper.insert(tdHygfJpInverterWarn);
             log.info("创建运维工单成功{}", JSON.toJSONString(hygfMaintenanceTickets));

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HYGFMaintenanceTicketsServiceImpl.java

@@ -33,6 +33,10 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
         return this.queryForPage(page, null, false);
     }
 
+    public List<String> queryInverterSncodesByStationId(String stationId){
+        return  this.getBaseMapper().queryInverterSncodesByStationId(stationId);
+    }
+
     /**
      * 列表查询 示例
      */
@@ -55,6 +59,8 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
         specialMap.put("inverterSncode",hygfMaintenanceTicketsDto.getInverterSn());
         //告警id
         specialMap.put("warningId",hygfMaintenanceTicketsDto.getWarningId());
+        specialMap.put("taskStartTime",hygfMaintenanceTicketsDto.getTaskStartTime());
+        specialMap.put("taskEndTime",hygfMaintenanceTicketsDto.getTaskEndTime());
         if(ObjectUtil.isNotEmpty(hygfMaintenanceTicketsDto.getWarningId())){
             //告警内容
             specialMap.put("warningContent",hygfMaintenanceTicketsDto.getWarningContent());

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties

-spring.application.name=AMOS-HYGF
+spring.application.name=AMOS-HYGF-CAOTAO
 server.servlet.context-path=/hygf
 server.port=33330
 server.uri-encoding=UTF-8