From c7e119ab1f3c8ab8a7b334f73024f456450c01b0 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Thu, 14 Apr 2022 23:51:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=9B=AE=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/category/dao/CategoryDao.java | 2 +- .../service/impl/CategoryServiceImpl.java | 16 ++- .../controller/ResourceController.java | 43 +++--- .../renren/modules/resource/dao/AttrDao.java | 1 + .../modules/resource/dao/ResourceDao.java | 4 + .../modules/resource/entity/AttrEntity.java | 136 +++++++++++++++++- .../resource/service/ResourceService.java | 8 ++ .../service/impl/ResourceServiceImpl.java | 27 +++- .../src/main/resources/application.yml | 1 + .../resources/mapper/category/CategoryDao.xml | 8 +- .../resources/mapper/resource/AttrDao.xml | 2 +- .../resources/mapper/resource/ResourceDao.xml | 81 +++++++++++ .../xss/XssHttpServletRequestWrapper.java | 1 - 13 files changed, 298 insertions(+), 32 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/category/dao/CategoryDao.java b/renren-admin/src/main/java/io/renren/modules/category/dao/CategoryDao.java index 832cea01..1a456652 100644 --- a/renren-admin/src/main/java/io/renren/modules/category/dao/CategoryDao.java +++ b/renren-admin/src/main/java/io/renren/modules/category/dao/CategoryDao.java @@ -16,5 +16,5 @@ public interface CategoryDao extends BaseDao { Integer deleteByIds(@Param("ids") List idList); - List selectFilterCriterByTopCategory(String topCategoryName); + List selectDictData(String linkValue); } diff --git a/renren-admin/src/main/java/io/renren/modules/category/service/impl/CategoryServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/category/service/impl/CategoryServiceImpl.java index 0cdb3304..1183980c 100644 --- a/renren-admin/src/main/java/io/renren/modules/category/service/impl/CategoryServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/category/service/impl/CategoryServiceImpl.java @@ -78,8 +78,20 @@ public class CategoryServiceImpl extends CrudServiceImpl getAllFilterCriteriaByTopCategory(String topCategoryName) { - //return categoryDao.selectFilterCriterByTopCategory(topCategoryName); - return null; + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("root_category", topCategoryName) + .eq("del_flag",0) + .eq("is_link_to_dic", "true") + .orderByAsc("xh"); + List categories = categoryDao.selectList(wrapper); + ArrayList resultList = new ArrayList<>(); + categories.forEach(item -> { + HashMap hashMap = new HashMap<>(); + hashMap.put("name", item.getName()); + hashMap.put("typeList", categoryDao.selectDictData(item.getLinkValue())); + resultList.add(hashMap); + }); + return resultList; } @Override diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java index 04350379..805332aa 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java @@ -1,19 +1,15 @@ package io.renren.modules.resource.controller; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import io.renren.common.annotation.LogOperation; import io.renren.common.constant.Constant; import io.renren.common.page.PageData; -import io.renren.common.utils.ExcelUtils; import io.renren.common.utils.Result; -import io.renren.common.validator.AssertUtils; import io.renren.common.validator.ValidatorUtils; import io.renren.common.validator.group.AddGroup; import io.renren.common.validator.group.DefaultGroup; import io.renren.common.validator.group.UpdateGroup; import io.renren.modules.resource.dto.ResourceDTO; -import io.renren.modules.resource.excel.ResourceExcel; import io.renren.modules.resource.service.ResourceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -23,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -40,23 +35,33 @@ public class ResourceController { @Autowired private ResourceService resourceService; - @PostMapping("/page") + @GetMapping("/page") @ApiOperation("分页查询资源信息") @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") , - @ApiImplicitParam(name = "pageSize", value = "每页显示记录数", paramType = "query",required = true, dataType="int") , - @ApiImplicitParam(name = "", value = "排序字段", paramType = "query", dataType="String") , + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") , + @ApiImplicitParam(name = "type", value = "类型", paramType = "query",required = true, dataType="String") , + //@ApiImplicitParam(name = "name", value = "资源名称", paramType = "query", dataType="String") , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") , @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") }) //@RequiresPermissions("resource:resource:page") - public Result> page(@RequestBody JSONObject jsonObject){ - String pageNum = jsonObject.getString("pageNum"); - String pageSize = jsonObject.getString("pageSize"); - ResourceDTO resourceDTO = JSON.toJavaObject(jsonObject, ResourceDTO.class); - //PageData page = resourceService.pageWithAttrs(params); + public Result> page(@ApiIgnore @RequestParam Map params){ + //ResourceDTO resourceDTO = JSON.toJavaObject(jsonObject, ResourceDTO.class); + //resourceService.pageWithAttrs(resourceDTO); + PageData page = resourceService.page(params); + page.getList().forEach(item -> { + item.setInfoList(resourceService.selectAttrsByResourceId(item.getId())); + }); + return new Result>().ok(page); + } - //return new Result>().ok(page); - return null; + @PostMapping("/pageWithAttrs") + @ApiOperation("分页查询资源信息2") + //@RequiresPermissions("resource:resource:page") + public Result pageWithAttrs(@RequestBody ResourceDTO resourceDTO){ + + return new Result<>().ok(resourceService.pageWithAttrs(resourceDTO)); } @GetMapping("/select/{id}") @@ -81,13 +86,13 @@ public class ResourceController { return new Result(); } - @PutMapping + @PutMapping("/update") @ApiOperation("修改") @LogOperation("修改") //@RequiresPermissions("resource:resource:update") public Result update(@RequestBody ResourceDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + ////效验数据 + //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); resourceService.updateWithAttrs(dto); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/AttrDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/AttrDao.java index d6a394ef..58bebc47 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dao/AttrDao.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/AttrDao.java @@ -17,4 +17,5 @@ import java.util.List; public interface AttrDao extends BaseDao { Integer delete4Resource(@Param("resourceIds") List idList); + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java index 3f3e74f3..5c2bee64 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java @@ -1,11 +1,13 @@ package io.renren.modules.resource.dao; import io.renren.common.dao.BaseDao; +import io.renren.modules.resource.dto.ResourceDTO; import io.renren.modules.resource.entity.ResourceEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 资源表 @@ -17,4 +19,6 @@ import java.util.List; public interface ResourceDao extends BaseDao { Integer deleteByIds(@Param("ids") List idList); + + List selectWithAttrs(ResourceDTO resourceDTO); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/entity/AttrEntity.java b/renren-admin/src/main/java/io/renren/modules/resource/entity/AttrEntity.java index 3041a700..1dbb119b 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/entity/AttrEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/entity/AttrEntity.java @@ -11,8 +11,8 @@ import java.util.Date; * @author dg * @since 1.0 2022-04-13 */ -@Data -@EqualsAndHashCode(callSuper=false) +//@Data +//@EqualsAndHashCode(callSuper=false) @TableName("tb_data_attr") public class AttrEntity { private static final long serialVersionUID = 1L; @@ -60,4 +60,136 @@ public class AttrEntity { private String note3; private String note4; private String note5; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDataResourceId() { + return dataResourceId; + } + + public void setDataResourceId(Long dataResourceId) { + this.dataResourceId = dataResourceId; + } + + public String getAttrType() { + return attrType; + } + + public void setAttrType(String attrType) { + this.attrType = attrType; + } + + public String getAttrValue() { + return attrValue; + } + + public void setAttrValue(String attrValue) { + this.attrValue = attrValue; + } + + public Integer getDelFlag() { + return delFlag; + } + + public void setDelFlag(Integer delFlag) { + this.delFlag = delFlag; + } + + public Long getCreator() { + return creator; + } + + public void setCreator(Long creator) { + this.creator = creator; + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public Long getUpdater() { + return updater; + } + + public void setUpdater(Long updater) { + this.updater = updater; + } + + public Date getUpdateDate() { + return updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } + + public String getNote1() { + return note1; + } + + public void setNote1(String note1) { + this.note1 = note1; + } + + public String getNote2() { + return note2; + } + + public void setNote2(String note2) { + this.note2 = note2; + } + + public String getNote3() { + return note3; + } + + public void setNote3(String note3) { + this.note3 = note3; + } + + public String getNote4() { + return note4; + } + + public void setNote4(String note4) { + this.note4 = note4; + } + + public String getNote5() { + return note5; + } + + public void setNote5(String note5) { + this.note5 = note5; + } + + @Override + public String toString() { + return "AttrEntity{" + + "id=" + id + + ", dataResourceId=" + dataResourceId + + ", attrType='" + attrType + '\'' + + ", attrValue='" + attrValue + '\'' + + ", delFlag=" + delFlag + + ", creator=" + creator + + ", createDate=" + createDate + + ", updater=" + updater + + ", updateDate=" + updateDate + + ", note1='" + note1 + '\'' + + ", note2='" + note2 + '\'' + + ", note3='" + note3 + '\'' + + ", note4='" + note4 + '\'' + + ", note5='" + note5 + '\'' + + '}'; + } } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java index d1953ded..fe1f2691 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java @@ -1,10 +1,14 @@ package io.renren.modules.resource.service; import com.alibaba.fastjson.JSONObject; +import io.renren.common.page.PageData; import io.renren.common.service.CrudService; import io.renren.modules.resource.dto.ResourceDTO; +import io.renren.modules.resource.entity.AttrEntity; import io.renren.modules.resource.entity.ResourceEntity; +import java.util.List; + /** * 资源表 * @@ -20,4 +24,8 @@ public interface ResourceService extends CrudService pageWithAttrs(ResourceDTO resourceDTO); + + List selectAttrsByResourceId(Long id); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 9c0cbe61..41357bc5 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -41,8 +42,10 @@ public class ResourceServiceImpl extends CrudServiceImpl getWrapper(Map params){ QueryWrapper wrapper = new QueryWrapper<>(); - - + wrapper.eq("type", params.get("type").toString()) + .eq("del_flag", 0) + //.like(StringUtils.isNotBlank(params.get("name").toString()),"name", params.get("name").toString()) + .orderByDesc("create_date"); return wrapper; } @@ -51,9 +54,11 @@ public class ResourceServiceImpl extends CrudServiceImpl attrEntities= dto.getInfoList(); attrEntities.forEach(item -> { item.setDelFlag(0); @@ -97,6 +102,20 @@ public class ResourceServiceImpl extends CrudServiceImpl attrEntities = attrDao.selectList(wrapper); resourceDTO.setInfoList(attrEntities); - return null; + return resourceDTO; + } + + @Override + public List pageWithAttrs(ResourceDTO resourceDTO) { + return resourceDao.selectWithAttrs(resourceDTO); + } + + @Override + public List selectAttrsByResourceId(Long resourceId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("data_resource_id", resourceId) + .eq("del_flag", 0) + .orderByDesc("attr_type"); + return attrDao.selectList(wrapper); } } \ No newline at end of file diff --git a/renren-admin/src/main/resources/application.yml b/renren-admin/src/main/resources/application.yml index d86c92b7..038ccbb6 100644 --- a/renren-admin/src/main/resources/application.yml +++ b/renren-admin/src/main/resources/application.yml @@ -66,3 +66,4 @@ mybatis-plus: cache-enabled: false call-setters-on-nulls: true jdbc-type-for-null: 'null' +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/renren-admin/src/main/resources/mapper/category/CategoryDao.xml b/renren-admin/src/main/resources/mapper/category/CategoryDao.xml index c6d3d09e..0d6a77b5 100644 --- a/renren-admin/src/main/resources/mapper/category/CategoryDao.xml +++ b/renren-admin/src/main/resources/mapper/category/CategoryDao.xml @@ -37,8 +37,12 @@ order by xh - + select * + from sys_dict_data + where 1 = 1 + and dict_type_id = #{linkValue} + order by sort diff --git a/renren-admin/src/main/resources/mapper/resource/AttrDao.xml b/renren-admin/src/main/resources/mapper/resource/AttrDao.xml index 3eb3daee..1521b982 100644 --- a/renren-admin/src/main/resources/mapper/resource/AttrDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/AttrDao.xml @@ -25,7 +25,7 @@ set del_flag = 1, update_date = now() where 1 = 1 - and data_resourceId in + and data_resource_id in #{item} diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 239f979a..fd620f64 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -26,6 +26,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update tb_data_resource set del_flag = 1, @@ -37,4 +76,46 @@ + \ No newline at end of file diff --git a/renren-common/src/main/java/io/renren/common/xss/XssHttpServletRequestWrapper.java b/renren-common/src/main/java/io/renren/common/xss/XssHttpServletRequestWrapper.java index c7f4781d..d04ac3fa 100644 --- a/renren-common/src/main/java/io/renren/common/xss/XssHttpServletRequestWrapper.java +++ b/renren-common/src/main/java/io/renren/common/xss/XssHttpServletRequestWrapper.java @@ -15,7 +15,6 @@ import java.nio.charset.StandardCharsets; import java.util.LinkedHashMap; import java.util.Map; - /** * XSS过滤处理 *