diff --git a/psdc-business/src/main/java/com/psdc/entity/vo/SceneVo.java b/psdc-business/src/main/java/com/psdc/entity/vo/SceneVo.java index 4e249df..aa7afef 100644 --- a/psdc-business/src/main/java/com/psdc/entity/vo/SceneVo.java +++ b/psdc-business/src/main/java/com/psdc/entity/vo/SceneVo.java @@ -43,7 +43,7 @@ public class SceneVo { /** 修改人 */ private String updateBy ; /** 修改时间 */ - private Date updateTime ; + private String updateTime ; public SceneVo(String sceneName, Integer deviceId, String sceneContext, String sceneKey, String sceneValue) { diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java index 98730fb..995bf84 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java @@ -124,7 +124,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { sc.setSceneCode(scenes.getSceneCode()); sc.setUserId(scenes.getUserId()); sc.setUpdateBy(userName); - sc.setUpdateTime(date); + sc.setUpdateTime(sdf.format(date)); sc.setSceneRemark(scenes.getSceneRemark()); } psdcSceneMapper.UpdateSceneData(scenesList); diff --git a/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml index 9cedea4..e3bffeb 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml @@ -70,6 +70,12 @@ scene_remark = #{item.sceneRemark}, + + update_by = #{item.updateBy}, + + + update_time = #{item.updateTime}, +