资料中心
This commit is contained in:
+22
-2
@@ -5,6 +5,8 @@ import com.adc.da.http.ResponseMessage;
|
|||||||
import com.adc.da.http.Result;
|
import com.adc.da.http.Result;
|
||||||
import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage;
|
import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage;
|
||||||
import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService;
|
import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService;
|
||||||
|
import com.adc.da.slrs.zlTree.entity.ZlTreeData;
|
||||||
|
import com.adc.da.slrs.zlTree.service.IZlTreeDataService;
|
||||||
import com.adc.da.util.UUIDUtils;
|
import com.adc.da.util.UUIDUtils;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
@@ -39,6 +41,9 @@ public class FileMaterialController extends BaseController<FileMaterial> {
|
|||||||
@Autowired
|
@Autowired
|
||||||
IFileMaterialService iFileMaterialService;
|
IFileMaterialService iFileMaterialService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
IZlTreeDataService iZlTreeService;
|
||||||
|
|
||||||
@PostMapping
|
@PostMapping
|
||||||
@ApiOperation("新增文件资料组")
|
@ApiOperation("新增文件资料组")
|
||||||
public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){
|
public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){
|
||||||
@@ -50,6 +55,12 @@ public class FileMaterialController extends BaseController<FileMaterial> {
|
|||||||
material.setId(UUIDUtils.randomUUID20());
|
material.setId(UUIDUtils.randomUUID20());
|
||||||
material.setDataUploadTime(new Date());
|
material.setDataUploadTime(new Date());
|
||||||
material.setDelFlag("0");
|
material.setDelFlag("0");
|
||||||
|
|
||||||
|
ZlTreeData zlTreeData=new ZlTreeData();
|
||||||
|
zlTreeData.setId(material.getTreeId());
|
||||||
|
zlTreeData.setDataId(material.getId());
|
||||||
|
iZlTreeService.save(zlTreeData);
|
||||||
|
|
||||||
boolean save = iFileMaterialService.save(material);
|
boolean save = iFileMaterialService.save(material);
|
||||||
|
|
||||||
return Result.success(save);
|
return Result.success(save);
|
||||||
@@ -61,7 +72,11 @@ public class FileMaterialController extends BaseController<FileMaterial> {
|
|||||||
public ResponseMessage deleteMaterial(String id){
|
public ResponseMessage deleteMaterial(String id){
|
||||||
List<String> idList = Arrays.asList(id.split(","));
|
List<String> idList = Arrays.asList(id.split(","));
|
||||||
boolean b = iFileMaterialService.removeByIds(idList);
|
boolean b = iFileMaterialService.removeByIds(idList);
|
||||||
|
if (null!= idList && idList.size()>0) {
|
||||||
|
QueryWrapper<ZlTreeData> wrapper = new QueryWrapper<>();
|
||||||
|
wrapper.in("data_id", idList);
|
||||||
|
iZlTreeService.remove(wrapper);
|
||||||
|
}
|
||||||
return Result.success(b);
|
return Result.success(b);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -80,7 +95,12 @@ public class FileMaterialController extends BaseController<FileMaterial> {
|
|||||||
@ApiOperation("修改文件资料组")
|
@ApiOperation("修改文件资料组")
|
||||||
public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){
|
public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){
|
||||||
boolean b = iFileMaterialService.updateById(fileMaterial);
|
boolean b = iFileMaterialService.updateById(fileMaterial);
|
||||||
|
ZlTreeData zlTreeData=new ZlTreeData();
|
||||||
|
zlTreeData.setId(fileMaterial.getTreeId());
|
||||||
|
zlTreeData.setDataId(fileMaterial.getId());
|
||||||
|
QueryWrapper<ZlTreeData> wrapper=new QueryWrapper<>();
|
||||||
|
wrapper.eq("data_id",fileMaterial.getId());
|
||||||
|
iZlTreeService.update(zlTreeData,wrapper);
|
||||||
return Result.success(b);
|
return Result.success(b);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -71,4 +71,8 @@ public class FileMaterial extends BaseEntity {
|
|||||||
@ApiModelProperty(value = "删除标志")
|
@ApiModelProperty(value = "删除标志")
|
||||||
@TableField("is_show")
|
@TableField("is_show")
|
||||||
private String isShow;
|
private String isShow;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "树id")
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String treeId;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@
|
|||||||
</update>
|
</update>
|
||||||
<select id="getFileMaterialPage" resultType="com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial">
|
<select id="getFileMaterialPage" resultType="com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial">
|
||||||
SELECT
|
SELECT
|
||||||
fm.*
|
fm.*,zd.id as treeId
|
||||||
FROM
|
FROM
|
||||||
file_material fm
|
file_material fm
|
||||||
LEFT JOIN zl_data zd ON zd.data_id=fm.id
|
LEFT JOIN zl_data zd ON zd.data_id=fm.id
|
||||||
|
|||||||
Reference in New Issue
Block a user