Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
bdb5efab
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1438
Star
162
Fork
130
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
bdb5efab
编写于
11月 13, 2018
作者:
Skyeye云
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
样式属性添加删除限制
上级
5b6c2dbf
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
26 addition
and
2 deletion
+26
-2
skyeye-dao/src/main/java/com/skyeye/smprogram/dao/RmPropertyDao.java
...src/main/java/com/skyeye/smprogram/dao/RmPropertyDao.java
+2
-0
skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/RmPropertyServiceImpl.java
.../skyeye/smprogram/service/impl/RmPropertyServiceImpl.java
+11
-1
skyeye-web/src/main/resources/dbmapper/RmPropertyMapper.xml
skyeye-web/src/main/resources/dbmapper/RmPropertyMapper.xml
+9
-0
skyeye-web/src/main/webapp/js/rmproperty/rmpropertylist.js
skyeye-web/src/main/webapp/js/rmproperty/rmpropertylist.js
+1
-0
skyeye-web/src/main/webapp/tpl/rmproperty/rmpropertylist.html
...ye-web/src/main/webapp/tpl/rmproperty/rmpropertylist.html
+3
-1
未找到文件。
skyeye-dao/src/main/java/com/skyeye/smprogram/dao/RmPropertyDao.java
浏览文件 @
bdb5efab
...
...
@@ -22,4 +22,6 @@ public interface RmPropertyDao {
public
List
<
Map
<
String
,
Object
>>
queryRmPropertyListToShow
(
Map
<
String
,
Object
>
map
)
throws
Exception
;
public
Map
<
String
,
Object
>
queryRmPropertyValueNumById
(
Map
<
String
,
Object
>
map
)
throws
Exception
;
}
skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/RmPropertyServiceImpl.java
浏览文件 @
bdb5efab
...
...
@@ -77,7 +77,17 @@ public class RmPropertyServiceImpl implements RmPropertyService{
@Override
public
void
deleteRmPropertyMationById
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
inputObject
.
getParams
();
rmPropertyDao
.
deleteRmPropertyMationById
(
map
);
Map
<
String
,
Object
>
bean
=
rmPropertyDao
.
queryRmPropertyValueNumById
(
map
);
if
(
bean
==
null
){
rmPropertyDao
.
deleteRmPropertyMationById
(
map
);
}
else
{
if
(
Integer
.
parseInt
(
bean
.
get
(
"propertyValueNum"
).
toString
())
==
0
){
//该样式属性下有值
rmPropertyDao
.
deleteRmPropertyMationById
(
map
);
}
else
{
outputObject
.
setreturnMessage
(
"该样式属性下存在值,无法删除。"
);
}
}
}
/**
...
...
skyeye-web/src/main/resources/dbmapper/RmPropertyMapper.xml
浏览文件 @
bdb5efab
...
...
@@ -13,6 +13,7 @@
a.js_content jsContent,
a.js_rely_on jsRelyOn,
a.property_unit propertyUnit,
(SELECT COUNT(*) FROM rm_property_value c WHERE c.property_id = a.id) propertyValueNum,
CONVERT(a.create_time, char) createTime
FROM
rm_property a
...
...
@@ -48,6 +49,14 @@
(#{id}, #{title}, #{propertyTag}, #{propertyOut}, #{propertyUnit}, #{dsFormContentId}, #{htmlContent}, #{jsContent}, #{jsRelyOn}, #{createId}, #{createTime})
</insert>
<select
id=
"queryRmPropertyValueNumById"
parameterType=
"java.util.Map"
resultType=
"java.util.Map"
>
SELECT
COUNT(*) propertyValueNum
FROM
rm_property_value a
WHERE a.property_id = #{id}
</select>
<delete
id=
"deleteRmPropertyMationById"
parameterType=
"java.util.Map"
>
DELETE
FROM
...
...
skyeye-web/src/main/webapp/js/rmproperty/rmpropertylist.js
浏览文件 @
bdb5efab
...
...
@@ -30,6 +30,7 @@ layui.config({
{
field
:
'
propertyUnit
'
,
title
:
'
属性单位
'
,
width
:
180
},
{
field
:
'
propertyOut
'
,
title
:
'
外部属性
'
,
width
:
150
},
{
field
:
'
contentName
'
,
title
:
'
展现形式
'
,
width
:
180
},
{
field
:
'
propertyValueNum
'
,
title
:
'
属性值数量
'
,
width
:
150
},
{
field
:
'
id
'
,
title
:
'
HTML内容
'
,
width
:
180
,
templet
:
function
(
d
){
if
(
!
isNull
(
d
.
htmlContent
)){
return
'
<i class="fa fa-fw fa-html5 cursor" lay-event="htmlContent"></i>
'
;
...
...
skyeye-web/src/main/webapp/tpl/rmproperty/rmpropertylist.html
浏览文件 @
bdb5efab
...
...
@@ -52,7 +52,9 @@
<table
id=
"messageTable"
lay-filter=
"messageTable"
></table>
<script
type=
"text/html"
id=
"tableBar"
>
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
edit
"
>
编辑
<
/a
>
<
a
class
=
"
layui-btn layui-btn-danger layui-btn-xs
"
lay
-
event
=
"
del
"
>
删除
<
/a
>
{{
#
if
(
d
.
propertyValueNum
==
0
){
}}
<
a
class
=
"
layui-btn layui-btn-danger layui-btn-xs
"
lay
-
event
=
"
del
"
>
删除
<
/a
>
{{
#
}
}}
</script>
</div>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录