diff --git a/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java b/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java index f50309e..c2a4e4d 100644 --- a/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java +++ b/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java @@ -37,6 +37,10 @@ public class DevAccessParam implements Serializable { @NotNull(message = "监测点集合不能为空") private List list; + @ApiModelProperty("注册方式(2:功能调试 3:出厂调试 4:设备注册)") + @NotNull(message = "注册方式不能为空") + private Integer process; + @Data public static class LineParam { diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java index e3d98a4..69c6238 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java @@ -23,10 +23,12 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.api.CsLogsFeignClient; import com.njcn.csdevice.api.EquipmentFeignClient; +import com.njcn.csdevice.api.ProcessFeignClient; import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm; import com.njcn.csdevice.pojo.param.CsLedgerParam; import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO; import com.njcn.csdevice.pojo.po.CsDeviceUserPO; +import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import com.njcn.redis.pojo.enums.AppRedisKey; @@ -44,6 +46,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -93,6 +97,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService { private final CsLogsFeignClient csLogsFeignClient; + private final ProcessFeignClient processFeignClient; + @Override @Transactional(rollbackFor = {Exception.class}) public void devRegister(String nDid) { @@ -335,6 +341,14 @@ public class CsDeviceServiceImpl implements ICsDeviceService { redisUtil.delete(AppRedisKey.SOFTINFO + devAccessParam.getNDid()); //存储日志 csLogsFeignClient.addUserLog(logDto); + //存储设备调试日志表 + CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO(); + csEquipmentProcess.setDevId(devAccessParam.getNDid()); + csEquipmentProcess.setOperator(RequestUtil.getUserIndex()); + csEquipmentProcess.setStartTime(LocalDateTime.now()); + csEquipmentProcess.setProcess(devAccessParam.getProcess()); + csEquipmentProcess.setStatus(1); + processFeignClient.add(csEquipmentProcess); } catch (Exception e) { logDto.setResult(0); logDto.setFailReason(e.getMessage());