Commit 96c2efdb by 李小惠

更新应用模块代码,新增删除接口

parent a9736737
...@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param; ...@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
...@@ -19,13 +20,13 @@ public class ApplicationReq extends BaseRequest { ...@@ -19,13 +20,13 @@ public class ApplicationReq extends BaseRequest {
/** /**
* 应用id * 应用id
*/ */
@NotBlank(message = "应用id不能为空",groups = {detail.class})
private String id; private String id;
/** /**
* 应用代码 * 应用代码
*/ */
@TableField("app_code") @TableField("app_code")
@NotBlank(message = "应用代码不能为空",groups = {detail.class})
private String appCode; private String appCode;
/** /**
...@@ -74,4 +75,7 @@ public class ApplicationReq extends BaseRequest { ...@@ -74,4 +75,7 @@ public class ApplicationReq extends BaseRequest {
* 更新人员 * 更新人员
*/ */
private String updateUser; private String updateUser;
//删除的id列表
private List<String> idsList;
} }
...@@ -52,10 +52,16 @@ public class ApplicationController { ...@@ -52,10 +52,16 @@ public class ApplicationController {
//新增或者修改应用信息 //新增或者修改应用信息
@PostMapping(path="/AddOrUpdateCfg",name="新增应用信息#logType=30") @PostMapping(path="/AddOrUpdateCfg",name="新增应用信息#logType=30")
@ApiOperation("新增应用信息") @ApiOperation("新增或修改应用信息")
public ApiRes<String> AddOrUpdateCfg(@RequestBody @Validated(ValidationApi.add.class) ApplicationReq req){ public ApiRes<String> AddOrUpdateCfg(@RequestBody @Validated(ValidationApi.add.class) ApplicationReq req){
return ApiRes.success(applicationService.AddOrUpdateCfg(req)); return ApiRes.success(applicationService.AddOrUpdateCfg(req));
} }
@PostMapping(path = "/delConfig",name = "删除应用信息#logType=30")
@ApiOperation("删除一个或者多个应用信息")
public ApiRes<Boolean> delConfig(@RequestBody ApplicationReq req){
return ApiRes.success(applicationService.delConfig(req));
}
} }
...@@ -16,11 +16,15 @@ public interface ApplicationService extends IService<Application> { ...@@ -16,11 +16,15 @@ public interface ApplicationService extends IService<Application> {
//获取分页应用信息 //获取分页应用信息
PageResult<Application> GetAllUpdateCfg(ApplicationReq req); PageResult<Application> GetAllUpdateCfg(ApplicationReq req);
//获取应用信息的列表
List<Application> GetAllUpdateCfgList(ApplicationReq req); List<Application> GetAllUpdateCfgList(ApplicationReq req);
//获取应用信息一个
Application GetOne(ApplicationReq req); Application GetOne(ApplicationReq req);
//新增应用信息 ////新增或者修改应用信息
String AddOrUpdateCfg(ApplicationReq req); String AddOrUpdateCfg(ApplicationReq req);
//删除一个或者多个应用信息
Boolean delConfig(ApplicationReq req);
} }
...@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.query.ApplicationReq; import com.junmp.jyzb.api.bean.query.ApplicationReq;
import com.junmp.jyzb.api.exception.JYZBAppException;
import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum; import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
import com.junmp.jyzb.api.exception.enums.EquipmentExceptionEnum;
import com.junmp.jyzb.api.exception.enums.PublicExceptionEnum; import com.junmp.jyzb.api.exception.enums.PublicExceptionEnum;
import com.junmp.jyzb.entity.Application; import com.junmp.jyzb.entity.Application;
import com.junmp.jyzb.service.ApplicationService; import com.junmp.jyzb.service.ApplicationService;
...@@ -18,7 +20,9 @@ import com.junmp.v2.db.api.factory.PageFactory; ...@@ -18,7 +20,9 @@ import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory; import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -38,18 +42,21 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli ...@@ -38,18 +42,21 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
return PageResultFactory.createPageResult(page); return PageResultFactory.createPageResult(page);
} }
//获取应用信息的列表
public List<Application> GetAllUpdateCfgList(ApplicationReq req) { public List<Application> GetAllUpdateCfgList(ApplicationReq req) {
LambdaQueryWrapper<Application> wrapper = createWrapper(req); LambdaQueryWrapper<Application> wrapper = createWrapper(req);
list(wrapper); list(wrapper);
return list(wrapper); return list(wrapper);
} }
//获取应用信息一个
public Application GetOne(ApplicationReq req) { public Application GetOne(ApplicationReq req) {
LambdaQueryWrapper<Application> wrapper = createWrapper(req); LambdaQueryWrapper<Application> wrapper = createWrapper(req);
Application one = getOne(wrapper); Application one = getOne(wrapper);
return ObjectUtil.isNull(one)?new Application():one; return ObjectUtil.isNull(one)?new Application():one;
} }
//新增应用信息 //新增或者修改应用信息
@Override @Override
public String AddOrUpdateCfg(ApplicationReq req) { public String AddOrUpdateCfg(ApplicationReq req) {
Application application = new Application(); Application application = new Application();
...@@ -93,6 +100,38 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli ...@@ -93,6 +100,38 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
} }
//删除一个或者多个应用信息
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean delConfig(ApplicationReq req) {
if (CollectionUtil.isEmpty(req.getIdsList())){
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
}
List<Application> list = list(new LambdaQueryWrapper<Application>().eq(Application::getId, req.getIdsList()));
List<String> nonexistentApp = new ArrayList<>();
for (String appId:req.getIdsList()) {
boolean flag=false;
for (Application app:list) {
if (appId.equals(app.getId())){
flag=true;
break;
}
}
if (!flag){
nonexistentApp.add(appId);
}
}
if (CollectionUtil.isNotEmpty(nonexistentApp)){
String msg="以下应用不存在:" +String.join(",", nonexistentApp);
throw new JYZBAppException(PublicExceptionEnum.APP_IS_NOT_EXIST, msg);
}else {
return removeBatchByIds(req.getIdsList());
}
}
private LambdaQueryWrapper<Application> createWrapper(ApplicationReq req) { private LambdaQueryWrapper<Application> createWrapper(ApplicationReq req) {
LambdaQueryWrapper<Application> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Application> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) { if (ObjectUtil.isEmpty(req)) {
...@@ -100,6 +139,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli ...@@ -100,6 +139,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
} }
wrapper.like(ObjectUtil.isNotEmpty(req.getName()),Application::getName,req.getName()); wrapper.like(ObjectUtil.isNotEmpty(req.getName()),Application::getName,req.getName());
wrapper.eq(ObjectUtil.isNotEmpty(req.getType()),Application::getType,req.getType()); wrapper.eq(ObjectUtil.isNotEmpty(req.getType()),Application::getType,req.getType());
wrapper.eq(ObjectUtil.isNotEmpty(req.getId()),Application::getId,req.getId());
wrapper.eq(ObjectUtil.isNotEmpty(req.getAppCode()),Application::getAppCode,req.getAppCode()); wrapper.eq(ObjectUtil.isNotEmpty(req.getAppCode()),Application::getAppCode,req.getAppCode());
wrapper.orderByDesc(Application::getCreateTime); wrapper.orderByDesc(Application::getCreateTime);
return wrapper; return wrapper;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论