diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java index b80076f..fd58dd7 100644 --- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java +++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java @@ -56,6 +56,7 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.sun.prism.paint.Color; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -423,7 +424,8 @@ public class PatrolPresetPosController extends BaseController { } @GetMapping - public AjaxResult getInfoByPatrolPointId(String patrolPointId) { + public AjaxResult getInfoByPatrolPointId(@RequestParam("patrolpointId") String patrolPointId) { + logger.info("[PRESET] getInfoByPatrolPointId patrolPointId: {}", patrolPointId); List patrolPresetPos = this.patrolPresetPosService.selectPatrolPresetPosByPatrolPointId(patrolPointId); return AjaxResult.success(patrolPresetPos); } @@ -455,6 +457,7 @@ public class PatrolPresetPosController extends BaseController { String stdPatrolPointId = patrolPresetPos.getStdParolPointId(); JSONObject paramJson = (new JSONObject()) .fluentPut("deviceId", patrolPresetPos.getDeviceId()) + .fluentPut("patrolPointId", patrolPresetPos.getPatrolPointId()) .fluentPut("patrolContent", basePresetId.getString("patrolContent")) .fluentPut("purpose", INSERT_PATROL_POINT_PURPOSE) .fluentPut("areaId", snap) @@ -489,10 +492,12 @@ public class PatrolPresetPosController extends BaseController { logger.info("[PRESET] 预置位编码不能为空！: {}", patrolPresetPos.getPresetPosCode()); throw new ServiceException("预置位编码不能为空！"); } else { - patrolPresetPosService.insertPatrolPresetPos(patrolPresetPos); + int insertResId = patrolPresetPosService.insertPatrolPresetPos(patrolPresetPos); + logger.info("[PRESET] insert insertResId: {}", insertResId); + } } else { - logger.warn("[PRESET] patrolPresetPos: {} already added!", patrolPresetPos1.getPatrolPointId()); + logger.info("[PRESET] patrolPresetPos: {} already added!", patrolPresetPos1.getPatrolPointId()); } } catch (Exception e) { this.basedataPatrolPointService.remove(new Long[]{patrolPresetPos.getPatrolPointId()}); @@ -568,6 +573,8 @@ public class PatrolPresetPosController extends BaseController { private int insertBasePreset(PatrolPresetPos patrolPresetPos) { JSONObject params = JSONObject.parseObject(JSONObject.toJSONString(patrolPresetPos)).fluentPut("presetCode", patrolPresetPos.getPresetPosCode()).fluentPut("presetName", patrolPresetPos.getPresetPosName()); + + logger.info("[METADATA] !!!!!!!!!!!!!!!!!!!!!insertBasePreset params: {}", params.toString()); return (Integer) this.basedataPatrolpointPresetService.add(params).get("data"); } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java index fdddedd..ce8eee5 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java @@ -136,7 +136,7 @@ public class BasedataPatrolPointController extends BaseController { basedataPatrolpoint.setMainDeviceId(basedataDevice.getDeviceId()); } - this.basedataPatrolPointService.insertBasedataPatrolPoint(basedataPatrolpoint); + basedataPatrolPointService.insertBasedataPatrolPoint(basedataPatrolpoint); return null != basedataPatrolpoint.getPatrolPointId() ? AjaxResult.success(basedataPatrolpoint.getPatrolPointId()) : AjaxResult.error("新增异常"); } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java index 86a4cab..9fd6075 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointPresetController.java @@ -91,6 +91,7 @@ public class BasedataPatrolPointPresetController extends BaseController { @Log(title = "巡检点预置位", businessType = BizType.INSERT) @PostMapping public AjaxResult add(@RequestBody BasedataPatrolPointPreset basedataPatrolpointPreset) { + logger.info("[METADATA] basedataPatrolpointPreset: {}", basedataPatrolpointPreset); return AjaxResult.success(this.basedataPatrolPointPresetService.insertBasedataPatrolPointPreset(basedataPatrolpointPreset)); } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java index 686f02c..ef23a89 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java @@ -58,6 +58,7 @@ public class BasedataPatrolPoint extends BaseEntity { @Excel( name = "标准巡检点位ID" ) + @JsonProperty("stdparolPointId") private Long stdParolPointId; private Long areaId; private String patrolTypeId; diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPointPreset.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPointPreset.java index 61001a9..2e129c7 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPointPreset.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPointPreset.java @@ -14,15 +14,16 @@ import lombok.Setter; public class BasedataPatrolPointPreset extends BaseEntity { private static final long serialVersionUID = 1L; private Long patrolPointPresetId; - @JsonProperty("patrolpointId") + @Excel( name = "点位id" ) + //@JsonProperty("patrolpointId") private Long patrolPointId; @Excel( name = "巡检设备ID" ) - @JsonProperty("eqpbookId") + //@JsonProperty("eqpbookId") private Long eqpBookId; @Excel( name = "通道编号" diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java index ca89b55..32a35fc 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java @@ -39,11 +39,14 @@ import java.util.Map; import javax.annotation.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @Service public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointService { + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); @Resource private BasedataPatrolPointMapper basedataPatrolpointMapper; @Resource @@ -100,7 +103,8 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi public BasedataPatrolPoint insertBasedataPatrolPoint(BasedataPatrolPoint basedataPatrolpoint) { basedataPatrolpoint.setCreateTime(DateUtils.getNowDate()); - this.basedataPatrolpointMapper.insertBasedataPatrolPoint(basedataPatrolpoint); + int resId = basedataPatrolpointMapper.insertBasedataPatrolPoint(basedataPatrolpoint); + logger.info("[METADATA] insertBasedataPatrolPoint resId: {}", resId); return basedataPatrolpoint; }