Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pms-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
pms-ci-test
Commits
a55fd729
提交
a55fd729
authored
6月 14, 2023
作者:
panda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
服务上下架接口添加
上级
78ec0eef
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
79 行增加
和
12 行删除
+79
-12
BackstageTaskServiceController.java
...om/mmc/pms/controller/BackstageTaskServiceController.java
+12
-5
BackstageTaskServiceDao.java
src/main/java/com/mmc/pms/dao/BackstageTaskServiceDao.java
+5
-1
UpAndDownServiceVO.java
...in/java/com/mmc/pms/model/work/vo/UpAndDownServiceVO.java
+30
-0
BackstageTaskService.java
src/main/java/com/mmc/pms/service/BackstageTaskService.java
+4
-1
BackstageTaskServiceImpl.java
...va/com/mmc/pms/service/Impl/BackstageTaskServiceImpl.java
+13
-3
BackstageTaskServiceDao.xml
src/main/resources/mapper/work/BackstageTaskServiceDao.xml
+15
-2
没有找到文件。
src/main/java/com/mmc/pms/controller/BackstageTaskServiceController.java
浏览文件 @
a55fd729
...
@@ -8,7 +8,7 @@ import com.mmc.pms.model.qo.ServiceQO;
...
@@ -8,7 +8,7 @@ import com.mmc.pms.model.qo.ServiceQO;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
import
com.mmc.pms.model.work.dto.WorkServiceDTO
;
import
com.mmc.pms.model.work.dto.WorkServiceDTO
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
com.mmc.pms.
page.PageResult
;
import
com.mmc.pms.
model.work.vo.UpAndDownServiceVO
;
import
com.mmc.pms.service.BackstageTaskService
;
import
com.mmc.pms.service.BackstageTaskService
;
import
io.swagger.annotations.*
;
import
io.swagger.annotations.*
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
...
@@ -46,11 +46,18 @@ public class BackstageTaskServiceController extends BaseController {
...
@@ -46,11 +46,18 @@ public class BackstageTaskServiceController extends BaseController {
return
backstageTaskService
.
updateById
(
param
);
return
backstageTaskService
.
updateById
(
param
);
}
}
@ApiOperation
(
value
=
"删除作业服务"
)
@ApiOperation
(
value
=
"
批量
删除作业服务"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@GetMapping
(
"deleteWorkService"
)
@PostMapping
(
"deleteWorkService"
)
public
ResultBody
deleteWorkService
(
@ApiParam
(
"作业服务id"
)
@RequestParam
(
value
=
"id"
)
Integer
id
)
{
public
ResultBody
deleteWorkService
(
@ApiParam
(
"作业服务id"
)
@RequestBody
List
<
Integer
>
ids
)
{
return
backstageTaskService
.
deleteById
(
id
);
return
backstageTaskService
.
deleteByIds
(
ids
);
}
@ApiOperation
(
value
=
"批量上下架作业服务"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@PostMapping
(
"batchUpAndDownWorkService"
)
public
ResultBody
batchUpAndDownWorkService
(
@RequestBody
UpAndDownServiceVO
param
)
{
return
backstageTaskService
.
batchUpAndDownWorkService
(
param
);
}
}
@ApiOperation
(
value
=
"查询作业服务"
)
@ApiOperation
(
value
=
"查询作业服务"
)
...
...
src/main/java/com/mmc/pms/dao/BackstageTaskServiceDao.java
浏览文件 @
a55fd729
package
com
.
mmc
.
pms
.
dao
;
package
com
.
mmc
.
pms
.
dao
;
import
com.mmc.pms.common.ResultBody
;
import
com.mmc.pms.entity.ServiceDO
;
import
com.mmc.pms.entity.ServiceDO
;
import
com.mmc.pms.model.qo.ServiceQO
;
import
com.mmc.pms.model.qo.ServiceQO
;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
import
com.mmc.pms.model.work.vo.UpAndDownServiceVO
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
@@ -19,7 +21,7 @@ public interface BackstageTaskServiceDao {
...
@@ -19,7 +21,7 @@ public interface BackstageTaskServiceDao {
Integer
update
(
ServiceDO
serviceDO
);
Integer
update
(
ServiceDO
serviceDO
);
Integer
deleteById
(
Integer
id
);
Integer
deleteById
s
(
@Param
(
"ids"
)
List
<
Integer
>
ids
);
ServiceDO
queryById
(
Integer
id
);
ServiceDO
queryById
(
Integer
id
);
...
@@ -32,4 +34,6 @@ public interface BackstageTaskServiceDao {
...
@@ -32,4 +34,6 @@ public interface BackstageTaskServiceDao {
List
<
ServiceDO
>
queryPageByLimit
(
@Param
(
"param"
)
ServiceQO
param
,
@Param
(
"categoriesIds"
)
List
<
Integer
>
categoriesIds
,
@Param
(
"userIds"
)
List
<
Integer
>
userIds
);
List
<
ServiceDO
>
queryPageByLimit
(
@Param
(
"param"
)
ServiceQO
param
,
@Param
(
"categoriesIds"
)
List
<
Integer
>
categoriesIds
,
@Param
(
"userIds"
)
List
<
Integer
>
userIds
);
List
<
ServiceDTO
>
QueryWorkServiceListById
(
@Param
(
"ids"
)
List
<
Integer
>
ids
);
List
<
ServiceDTO
>
QueryWorkServiceListById
(
@Param
(
"ids"
)
List
<
Integer
>
ids
);
Integer
batchUpAndDownWorkService
(
@Param
(
"param"
)
UpAndDownServiceVO
param
);
}
}
src/main/java/com/mmc/pms/model/work/vo/UpAndDownServiceVO.java
0 → 100644
浏览文件 @
a55fd729
package
com
.
mmc
.
pms
.
model
.
work
.
vo
;
import
com.mmc.pms.model.group.Update
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.util.List
;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public
class
UpAndDownServiceVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"id集合"
)
@Size
(
min
=
1
,
message
=
"修改时id集合不能为空"
,
groups
=
Update
.
class
)
private
List
<
Integer
>
ids
;
@ApiModelProperty
(
value
=
"展示状态,0为上架,1下架"
,
example
=
"0"
)
@NotNull
(
message
=
"修改时展示状态不能为空"
,
groups
=
Update
.
class
)
private
Integer
displayState
;
}
src/main/java/com/mmc/pms/service/BackstageTaskService.java
浏览文件 @
a55fd729
...
@@ -4,6 +4,7 @@ import com.mmc.pms.common.ResultBody;
...
@@ -4,6 +4,7 @@ import com.mmc.pms.common.ResultBody;
import
com.mmc.pms.model.qo.ServiceQO
;
import
com.mmc.pms.model.qo.ServiceQO
;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
com.mmc.pms.model.work.vo.UpAndDownServiceVO
;
import
com.mmc.pms.page.PageResult
;
import
com.mmc.pms.page.PageResult
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
...
@@ -19,7 +20,7 @@ public interface BackstageTaskService {
...
@@ -19,7 +20,7 @@ public interface BackstageTaskService {
ResultBody
updateById
(
ServiceVO
param
);
ResultBody
updateById
(
ServiceVO
param
);
ResultBody
deleteById
(
Integer
id
);
ResultBody
deleteById
s
(
List
<
Integer
>
ids
);
ResultBody
<
ServiceDTO
>
queryById
(
Integer
id
);
ResultBody
<
ServiceDTO
>
queryById
(
Integer
id
);
...
@@ -28,4 +29,6 @@ public interface BackstageTaskService {
...
@@ -28,4 +29,6 @@ public interface BackstageTaskService {
PageResult
queryWorkServiceList
(
ServiceQO
param
,
HttpServletRequest
request
);
PageResult
queryWorkServiceList
(
ServiceQO
param
,
HttpServletRequest
request
);
List
<
ServiceDTO
>
feignQueryWorkServiceListById
(
List
<
Integer
>
ids
);
List
<
ServiceDTO
>
feignQueryWorkServiceListById
(
List
<
Integer
>
ids
);
ResultBody
batchUpAndDownWorkService
(
UpAndDownServiceVO
param
);
}
}
src/main/java/com/mmc/pms/service/Impl/BackstageTaskServiceImpl.java
浏览文件 @
a55fd729
...
@@ -14,6 +14,7 @@ import com.mmc.pms.model.qo.ServiceQO;
...
@@ -14,6 +14,7 @@ import com.mmc.pms.model.qo.ServiceQO;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
import
com.mmc.pms.model.work.dto.ServiceDTO
;
import
com.mmc.pms.model.work.dto.WorkServiceDTO
;
import
com.mmc.pms.model.work.dto.WorkServiceDTO
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
com.mmc.pms.model.work.vo.ServiceVO
;
import
com.mmc.pms.model.work.vo.UpAndDownServiceVO
;
import
com.mmc.pms.page.PageResult
;
import
com.mmc.pms.page.PageResult
;
import
com.mmc.pms.service.BackstageTaskService
;
import
com.mmc.pms.service.BackstageTaskService
;
import
com.mmc.pms.service.InspComtService
;
import
com.mmc.pms.service.InspComtService
;
...
@@ -21,7 +22,6 @@ import lombok.extern.slf4j.Slf4j;
...
@@ -21,7 +22,6 @@ import lombok.extern.slf4j.Slf4j;
import
org.apache.commons.lang.time.DateFormatUtils
;
import
org.apache.commons.lang.time.DateFormatUtils
;
import
org.apache.commons.lang3.RandomUtils
;
import
org.apache.commons.lang3.RandomUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.time.DateUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -66,8 +66,10 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
...
@@ -66,8 +66,10 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
}
}
@Override
@Override
public
ResultBody
deleteById
(
Integer
id
)
{
public
ResultBody
deleteByIds
(
List
<
Integer
>
ids
)
{
backstageTaskServiceDao
.
deleteById
(
id
);
if
(!
CollectionUtils
.
isEmpty
(
ids
)){
backstageTaskServiceDao
.
deleteByIds
(
ids
);
}
return
ResultBody
.
success
();
return
ResultBody
.
success
();
}
}
...
@@ -172,6 +174,14 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
...
@@ -172,6 +174,14 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
return
backstageTaskServiceDao
.
QueryWorkServiceListById
(
ids
);
return
backstageTaskServiceDao
.
QueryWorkServiceListById
(
ids
);
}
}
@Override
public
ResultBody
batchUpAndDownWorkService
(
UpAndDownServiceVO
param
)
{
if
(!
CollectionUtils
.
isEmpty
(
param
.
getIds
())){
backstageTaskServiceDao
.
batchUpAndDownWorkService
(
param
);
}
return
ResultBody
.
success
();
}
private
List
<
WorkServiceDTO
>
getWorkServiceDTOS
(
List
<
ServiceDO
>
pageList
)
{
private
List
<
WorkServiceDTO
>
getWorkServiceDTOS
(
List
<
ServiceDO
>
pageList
)
{
// 用户暂时无关联公司数据,先用假数据展示
// 用户暂时无关联公司数据,先用假数据展示
String
companyName
=
"浙江科比特创新科技有限公司"
;
String
companyName
=
"浙江科比特创新科技有限公司"
;
...
...
src/main/resources/mapper/work/BackstageTaskServiceDao.xml
浏览文件 @
a55fd729
...
@@ -153,10 +153,13 @@
...
@@ -153,10 +153,13 @@
</update>
</update>
<!--通过主键删除-->
<!--通过主键删除-->
<update
id=
"deleteById"
parameterType=
"java.lang.Integer"
>
<update
id=
"deleteById
s
"
parameterType=
"java.lang.Integer"
>
update service
update service
set is_deleted = 1
set is_deleted = 1
where id = #{id}
where
<foreach
collection=
"ids"
open=
"id in ("
close=
")"
item=
"item"
separator=
","
>
#{item}
</foreach>
</update>
</update>
<select
id=
"conditionCount"
resultType=
"java.lang.Integer"
>
<select
id=
"conditionCount"
resultType=
"java.lang.Integer"
>
...
@@ -254,4 +257,13 @@
...
@@ -254,4 +257,13 @@
</foreach>
</foreach>
</if>
</if>
</select>
</select>
<select
id=
"batchUpAndDownWorkService"
resultType=
"java.lang.Integer"
>
update service
set display_state = #{param.displayState}
where
<foreach
collection=
"param.ids"
open=
"id in ("
close=
")"
item=
"item"
separator=
","
>
#{item}
</foreach>
</select>
</mapper>
</mapper>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论