supervision-spring.git

			@@ -83,6 +83,7 @@
			val name = scense.name ?: ""
			val example = Example(Scense::class.java)
			val criteria = example.createCriteria()
			criteria.andEqualTo("typeid", scense.typeid)
			//如果有type信息,就构建type查询
			if (StringUtil.isNotEmpty(scense.type)) {
			criteria.andEqualTo("type", scense.type)
			@@ -99,6 +100,10 @@
			if (StringUtil.isNotEmpty(scense.towncode)) {
			criteria.andEqualTo("towncode", scense.towncode)
			}
			if (StringUtil.isNotEmpty(scense.extension1)) {
			criteria.andEqualTo("extension1", scense.extension1)
			}
			criteria.andEqualTo("index", scense.index)
			//name查询
			criteria.andLike("name", "%$name%")
			val re = scenseMapper.selectByExample(example)
			@@ -278,10 +283,10 @@
			override fun getSceneDetail(sceneId: String): BaseResponse<SceneDetail> {
			val sceneDetail = SceneDetail()

			val scene = scenseMapper.selectByPrimaryKey(sceneId)
			val scene = sceneRep.findScene(sceneId = sceneId)
			sceneDetail.scense = scene

			val mapper = when (scene.typeid.toString()) {
			val mapper = when (scene?.typeid.toString()) {
			Constant.SceneType.TYPE1.value -> sceneConstructionSiteMapper
			Constant.SceneType.TYPE2.value -> sceneWharfMapper
			Constant.SceneType.TYPE3.value -> sceneMixingPlantMapper
			@@ -411,7 +416,7 @@
			val scenes = sceneImport.readFromFile(f)
			// 查找场景名称是否重复
			val names = scenes.map { it.name }
			sceneRep.findScenes(names).map { it?.name }.ifNotEmpty {
			sceneRep.findSceneList(names).map { it?.name }.ifNotEmpty {
			val str = this.joinToString("，")
			throw BizException("存在重复场景，如下：${str}")
			}
			@@ -423,7 +428,7 @@

			override fun createScene(scense: Scense): Scense {
			val names = listOf(scense.name)
			sceneRep.findScenes(names).map { it?.name }.ifNotEmpty {
			sceneRep.findSceneList(names).map { it?.name }.ifNotEmpty {
			val str = this.joinToString("，")
			throw BizException("存在重复场景，如下：${str}")
			}