Skip to content

N
nrgl
提交 7783c1be authored 作者: niguanghui's avatar niguanghui
浏览文件
操作

--no commit message

上级 002de528
隐藏空白字符变更
内嵌 并排
正在显示 包含 66 行增加 和 102 行删除
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/achievementLibrary/AchievementLibraryController.java
浏览文件 @ 7783c1be
......@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiOperation;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
......@@ -29,7 +28,6 @@ import com.zrqx.core.constant.resource.ResourceRequestPath;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.resource.bg.ImportOneForm;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
import com.zrqx.core.form.resource.bg.BatchUpdateForm;
......@@ -44,7 +42,6 @@ import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
import com.zrqx.core.util.UUIDUtil;
import com.zrqx.core.vo.resource.ResourceRelationListVo;
import com.zrqx.core.vo.resource.ResourceRelationVo;
import com.zrqx.core.vo.resource.achievementLibrary.AchievementLibraryListVo;
import com.zrqx.core.vo.resource.achievementLibrary.AchievementLibraryOneVo;
......@@ -145,23 +142,25 @@ public class AchievementLibraryController {
return CallBack.success();
}
@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity) {
if (entity.getId() != null || entity.getResourceIds() == null || entity.getObjectId() == null
|| entity.getResourceType() == null || entity.getResourceIds().length == 0) {
throw new BaseException("必须指定objectId、被关联的resourceId、资源类型");
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
if(entity.getId()!= null || entity.getId()!= "" || entity.getResourceIds() == null || entity.getResourceType() == null || entity.getResourceIds().size() <= 0){
throw new BaseException("必须指定id、被关联的resourceId、资源类型");
}
List<AchievementResource> recordList = new ArrayList<AchievementResource>();
Arrays.asList(entity.getResourceIds()).forEach(resourceId -> {
for (int i = 0; i < entity.getResourceIds().size(); i++) {
AchievementResource e = new AchievementResource();
e.setResourceId(resourceId);
e.setResourceId(entity.getResourceIds().get(i));
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setObjectId(entity.getObjectId());
e.setName(entity.getName());
e.setName(entity.getNames().get(i));
if (e.getCover()!=null && e.getCover()!="") {
e.setCover(e.getCover());
}
recordList.add(e);
});
};
return CallBack.success(resourceService.insertUuidList(recordList));
}
......@@ -227,9 +226,4 @@ public class AchievementLibraryController {
return CallBack.success();
}
@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<ResourceRelationListVo>> page(QueryResourceForPoPForm form, PageParam pageParam){
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/clauseLibrary/ClauseLibraryController.java
浏览文件 @ 7783c1be
......@@ -6,7 +6,6 @@ package com.zrqx.resource.bg.controller.clauseLibrary;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
......@@ -29,7 +28,6 @@ import com.zrqx.core.constant.resource.ResourceRequestPath;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.resource.bg.ImportOneForm;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
import com.zrqx.core.form.resource.bg.BatchUpdateForm;
......@@ -44,7 +42,6 @@ import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
import com.zrqx.core.util.UUIDUtil;
import com.zrqx.core.vo.resource.ResourceRelationListVo;
import com.zrqx.core.vo.resource.ResourceRelationVo;
import com.zrqx.core.vo.resource.clauseLibrary.ClauseLibraryListVo;
import com.zrqx.core.vo.resource.clauseLibrary.ClauseLibraryOneVo;
......@@ -143,23 +140,25 @@ public class ClauseLibraryController {
return CallBack.success();
}
@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity) {
if (entity.getId() != null || entity.getResourceIds() == null || entity.getObjectId() == null
|| entity.getResourceType() == null || entity.getResourceIds().length == 0) {
throw new BaseException("必须指定objectId、被关联的resourceId、资源类型");
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
if(entity.getId()!= null || entity.getId()!= "" || entity.getResourceIds() == null || entity.getResourceType() == null || entity.getResourceIds().size() <= 0){
throw new BaseException("必须指定id、被关联的resourceId、资源类型");
}
List<ClauseResource> recordList = new ArrayList<ClauseResource>();
Arrays.asList(entity.getResourceIds()).forEach(resourceId -> {
for (int i = 0; i < entity.getResourceIds().size(); i++) {
ClauseResource e = new ClauseResource();
e.setResourceId(resourceId);
e.setResourceId(entity.getResourceIds().get(i));
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setObjectId(entity.getObjectId());
e.setName(entity.getName());
e.setName(entity.getNames().get(i));
if (e.getCover()!=null && e.getCover()!="") {
e.setCover(e.getCover());
}
recordList.add(e);
});
};
return CallBack.success(resourceService.insertUuidList(recordList));
}
......@@ -225,9 +224,4 @@ public class ClauseLibraryController {
return CallBack.success();
}
@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<ResourceRelationListVo>> page(QueryResourceForPoPForm form, PageParam pageParam){
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/criterionLibrary/CriterionLibraryController.java
浏览文件 @ 7783c1be
......@@ -6,7 +6,6 @@ package com.zrqx.resource.bg.controller.criterionLibrary;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
......@@ -29,7 +28,6 @@ import com.zrqx.core.constant.resource.ResourceRequestPath;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.resource.bg.ImportOneForm;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
import com.zrqx.core.form.resource.bg.BatchUpdateForm;
......@@ -44,7 +42,6 @@ import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
import com.zrqx.core.util.UUIDUtil;
import com.zrqx.core.vo.resource.ResourceRelationListVo;
import com.zrqx.core.vo.resource.ResourceRelationVo;
import com.zrqx.core.vo.resource.criterionLibrary.CriterionLibraryListVo;
import com.zrqx.core.vo.resource.criterionLibrary.CriterionLibraryOneVo;
......@@ -167,23 +164,25 @@ public class CriterionLibraryController {
return CallBack.success();
}
@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity) {
if (entity.getObjectId() != null || entity.getResourceIds() == null || entity.getObjectId() == null
|| entity.getResourceType() == null || entity.getResourceIds().length == 0) {
throw new BaseException("必须指定objectId、被关联的resourceId、资源类型");
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
if(entity.getId()!= null || entity.getId()!= "" || entity.getResourceIds() == null || entity.getResourceType() == null || entity.getResourceIds().size() <= 0){
throw new BaseException("必须指定id、被关联的resourceId、资源类型");
}
List<CriterionResource> recordList = new ArrayList<CriterionResource>();
Arrays.asList(entity.getResourceIds()).forEach(resourceId -> {
for (int i = 0; i < entity.getResourceIds().size(); i++) {
CriterionResource e = new CriterionResource();
e.setResourceId(resourceId);
e.setResourceId(entity.getResourceIds().get(i));
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setObjectId(entity.getObjectId());
e.setName(entity.getName());
e.setName(entity.getNames().get(i));
if (e.getCover()!=null && e.getCover()!="") {
e.setCover(e.getCover());
}
recordList.add(e);
});
};
return CallBack.success(resourceService.insertUuidList(recordList));
}
......@@ -227,9 +226,4 @@ public class CriterionLibraryController {
return CallBack.success();
}
@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<ResourceRelationListVo>> page(QueryResourceForPoPForm form, PageParam pageParam){
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/paperLibrary/PaperLibraryController.java
浏览文件 @ 7783c1be
......@@ -3,7 +3,6 @@ package com.zrqx.resource.bg.controller.paperLibrary;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
......@@ -25,7 +24,6 @@ import tk.mybatis.mapper.entity.Example.Criteria;
import com.zrqx.core.constant.resource.ResourceRequestPath;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
import com.zrqx.core.form.resource.bg.BatchUpdateForm;
......@@ -39,7 +37,6 @@ import com.zrqx.core.model.resource.paperLibrary.PaperResource;
import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
import com.zrqx.core.vo.resource.ResourceRelationListVo;
import com.zrqx.core.vo.resource.ResourceRelationVo;
import com.zrqx.core.vo.resource.paperLibrary.PaperLibraryListVo;
import com.zrqx.core.vo.resource.paperLibrary.PaperLibraryOneVo;
......@@ -158,23 +155,25 @@ public class PaperLibraryController {
return CallBack.success();
}
@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity) {
if (entity.getId() != null || entity.getResourceIds() == null || entity.getObjectId() == null
|| entity.getResourceType() == null || entity.getResourceIds().length == 0) {
throw new BaseException("必须指定objectId、被关联的resourceId、资源类型");
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
if(entity.getId()!= null || entity.getId()!= "" || entity.getResourceIds() == null || entity.getResourceType() == null || entity.getResourceIds().size() <= 0){
throw new BaseException("必须指定id、被关联的resourceId、资源类型");
}
List<PaperResource> recordList = new ArrayList<PaperResource>();
Arrays.asList(entity.getResourceIds()).forEach(resourceId -> {
for (int i = 0; i < entity.getResourceIds().size(); i++) {
PaperResource e = new PaperResource();
e.setResourceId(resourceId);
e.setResourceId(entity.getResourceIds().get(i));
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setObjectId(entity.getObjectId());
e.setName(entity.getName());
e.setName(entity.getNames().get(i));
if (e.getCover()!=null && e.getCover()!="") {
e.setCover(e.getCover());
}
recordList.add(e);
});
};
return CallBack.success(resourceService.insertUuidList(recordList));
}
......@@ -212,9 +211,4 @@ public class PaperLibraryController {
return CallBack.success(service.batchDelete(ids));
}
@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<ResourceRelationListVo>> page(QueryResourceForPoPForm form, PageParam pageParam){
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/patentLibrary/PatentLibraryController.java
浏览文件 @ 7783c1be
......@@ -6,7 +6,6 @@ package com.zrqx.resource.bg.controller.patentLibrary;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
......@@ -29,7 +28,6 @@ import com.zrqx.core.constant.resource.ResourceRequestPath;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.resource.bg.ImportOneForm;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
import com.zrqx.core.form.resource.bg.BatchUpdateForm;
......@@ -44,7 +42,6 @@ import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
import com.zrqx.core.util.UUIDUtil;
import com.zrqx.core.vo.resource.ResourceRelationListVo;
import com.zrqx.core.vo.resource.ResourceRelationVo;
import com.zrqx.core.vo.resource.patentLibrary.PatentLibraryListVo;
import com.zrqx.core.vo.resource.patentLibrary.PatentLibraryOneVo;
......@@ -167,23 +164,25 @@ public class PatentLibraryController {
return CallBack.success();
}
@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity) {
if (entity.getId() != null || entity.getResourceIds() == null || entity.getObjectId() == null
|| entity.getResourceType() == null || entity.getResourceIds().length == 0) {
throw new BaseException("必须指定objectId、被关联的resourceId、资源类型");
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
if(entity.getId()!= null || entity.getId()!= "" || entity.getResourceIds() == null || entity.getResourceType() == null || entity.getResourceIds().size() <= 0){
throw new BaseException("必须指定id、被关联的resourceId、资源类型");
}
List<PatentResource> recordList = new ArrayList<PatentResource>();
Arrays.asList(entity.getResourceIds()).forEach(resourceId -> {
for (int i = 0; i < entity.getResourceIds().size(); i++) {
PatentResource e = new PatentResource();
e.setResourceId(resourceId);
e.setResourceId(entity.getResourceIds().get(i));
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setObjectId(entity.getObjectId());
e.setName(entity.getName());
e.setName(entity.getNames().get(i));
if (e.getCover()!=null && e.getCover()!="") {
e.setCover(e.getCover());
}
recordList.add(e);
});
};
return CallBack.success(resourceService.insertUuidList(recordList));
}
......@@ -227,9 +226,4 @@ public class PatentLibraryController {
return CallBack.success();
}
@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<ResourceRelationListVo>> page(QueryResourceForPoPForm form, PageParam pageParam){
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/statuteLibrary/StatuteLibraryController.java
浏览文件 @ 7783c1be
......@@ -6,7 +6,6 @@ package com.zrqx.resource.bg.controller.statuteLibrary;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
......@@ -29,7 +28,6 @@ import com.zrqx.core.constant.resource.ResourceRequestPath;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.resource.bg.ImportOneForm;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
import com.zrqx.core.form.resource.bg.BatchUpdateForm;
......@@ -44,7 +42,6 @@ import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
import com.zrqx.core.util.UUIDUtil;
import com.zrqx.core.vo.resource.ResourceRelationListVo;
import com.zrqx.core.vo.resource.ResourceRelationVo;
import com.zrqx.core.vo.resource.statuteLibrary.StatuteLibraryListVo;
import com.zrqx.core.vo.resource.statuteLibrary.StatuteLibraryOneVo;
......@@ -167,23 +164,25 @@ public class StatuteLibraryController {
return CallBack.success();
}
@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity) {
if (entity.getId() != null || entity.getResourceIds() == null || entity.getObjectId() == null
|| entity.getResourceType() == null || entity.getResourceIds().length == 0) {
throw new BaseException("必须指定objectId、被关联的resourceId、资源类型");
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
if(entity.getId()!= null || entity.getId()!= "" || entity.getResourceIds() == null || entity.getResourceType() == null || entity.getResourceIds().size() <= 0){
throw new BaseException("必须指定id、被关联的resourceId、资源类型");
}
List<StatuteResource> recordList = new ArrayList<StatuteResource>();
Arrays.asList(entity.getResourceIds()).forEach(resourceId -> {
for (int i = 0; i < entity.getResourceIds().size(); i++) {
StatuteResource e = new StatuteResource();
e.setResourceId(resourceId);
e.setResourceId(entity.getResourceIds().get(i));
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setObjectId(entity.getObjectId());
e.setName(entity.getName());
e.setName(entity.getNames().get(i));
if (e.getCover()!=null && e.getCover()!="") {
e.setCover(e.getCover());
}
recordList.add(e);
});
};
return CallBack.success(resourceService.insertUuidList(recordList));
}
......@@ -227,9 +226,4 @@ public class StatuteLibraryController {
return CallBack.success();
}
@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<ResourceRelationListVo>> page(QueryResourceForPoPForm form, PageParam pageParam){
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论