update

src/main/java/com/zhiqiyun/open/core/mapper/category/CategoryOrganizationMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.category;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.category.CategoryOrganization;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CategoryOrganizationMapper extends BaseMapper<CategoryOrganization> {
+}

src/main/java/com/zhiqiyun/open/core/mapper/cultural/tourism/OrganizationInfoMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.cultural.tourism;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.cultural.tourism.OrganizationInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface OrganizationInfoMapper extends BaseMapper<OrganizationInfo> {
-}

src/main/java/com/zhiqiyun/open/core/models/cultural/tourism/OrganizationInfo.java → src/main/java/com/zhiqiyun/open/core/models/category/CategoryOrganization.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models.cultural.tourism;
+package com.zhiqiyun.open.core.models.category;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,8 +10,8 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
-@TableName("cultural_tourism_organization_info")
-public class OrganizationInfo implements Serializable {
+@TableName("category_organization")
+public class CategoryOrganization implements Serializable {
 
     private static final long serialVersionUID = -6150838695137938651L;
 

src/main/java/com/zhiqiyun/open/core/service/CategoryOrganizationService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.category.CategoryOrganization;
+
+public interface CategoryOrganizationService extends IService<CategoryOrganization> {
+}

src/main/java/com/zhiqiyun/open/core/service/OrganizationInfoService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.cultural.tourism.OrganizationInfo;
-
-public interface OrganizationInfoService extends IService<OrganizationInfo> {
-}

src/main/java/com/zhiqiyun/open/core/service/impl/CategoryOrganizationServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.category.CategoryOrganizationMapper;
+import com.zhiqiyun.open.core.models.category.CategoryOrganization;
+import com.zhiqiyun.open.core.service.CategoryOrganizationService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CategoryOrganizationServiceImpl extends ServiceImpl<CategoryOrganizationMapper, CategoryOrganization> implements CategoryOrganizationService {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/OrganizationInfoServiceImpl.java

@@ -1,11 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.cultural.tourism.OrganizationInfoMapper;
-import com.zhiqiyun.open.core.models.cultural.tourism.OrganizationInfo;
-import com.zhiqiyun.open.core.service.OrganizationInfoService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class OrganizationInfoServiceImpl extends ServiceImpl<OrganizationInfoMapper, OrganizationInfo> implements OrganizationInfoService {
-}

src/main/java/com/zhiqiyun/open/mvc/controller/OrganizationController.java → src/main/java/com/zhiqiyun/open/mvc/controller/CategoryOrganizationController.java

@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.cultural.tourism.OrganizationInfo;
+import com.zhiqiyun.open.core.models.category.CategoryOrganization;
 import com.zhiqiyun.open.core.models.user.OauthInfo;
 import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.OrganizationInfoService;
+import com.zhiqiyun.open.core.service.CategoryOrganizationService;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.cultural.tourism.QueryOrganizationInfoParam;
-import com.zhiqiyun.open.mvc.params.cultural.tourism.SaveOrganizationInfoParam;
+import com.zhiqiyun.open.mvc.params.category.QueryCategoryOrganizationParam;
+import com.zhiqiyun.open.mvc.params.category.SaveCategoryOrganizationParam;
 import com.zhiqiyun.open.utils.DateUtil;
 import com.zhiqiyun.open.utils.ServletContext;
 import org.apache.commons.lang3.StringUtils;
@@ -26,11 +26,11 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/cultural/tourism/organization")
-public class OrganizationController {
+@RequestMapping("/category/organization")
+public class CategoryOrganizationController {
 
     @Autowired
-    private OrganizationInfoService organizationInfoService;
+    private CategoryOrganizationService categoryOrganizationService;
 
     @Autowired
     private SequenceService sequenceService;
@@ -38,11 +38,11 @@ public class OrganizationController {
     @Autowired
     private OauthService oauthService;
 
-    @Permission(value = "cultural.tourism.organization.find", tags = "查询文旅机构")
+    @Permission(value = "category.organization.find", tags = "查询文旅机构目录")
     @PostMapping("/findPage")
-    public Result findPage(@RequestBody QueryOrganizationInfoParam param) {
+    public Result findPage(@RequestBody QueryCategoryOrganizationParam param) {
 
-        QueryWrapper<OrganizationInfo> wrapper = new QueryWrapper<>();
+        QueryWrapper<CategoryOrganization> wrapper = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(param.getName())) {
             wrapper.like("name", param.getName());
@@ -59,19 +59,19 @@ public class OrganizationController {
         if (StringUtils.isNotBlank(param.getContactNumber())) {
             wrapper.like("contact_number", param.getContactNumber());
         }
-        Page<OrganizationInfo> page = param.getPage();
+        Page<CategoryOrganization> page = param.getPage();
         page.addOrder(OrderItem.desc("id"));
 
-        Page<OrganizationInfo> resultData = this.organizationInfoService.page(page, wrapper);
+        Page<CategoryOrganization> resultData = this.categoryOrganizationService.page(page, wrapper);
 
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
-    @Permission(value = "cultural.tourism.organization.add", tags = "新建文旅机构")
+    @Permission(value = "category.organization.add", tags = "新建文旅机构目录")
     @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveOrganizationInfoParam param) throws Exception {
+    public Result save(@Valid @RequestBody SaveCategoryOrganizationParam param) throws Exception {
 
-        OrganizationInfo entity = new OrganizationInfo();
+        CategoryOrganization entity = new CategoryOrganization();
         BeanUtils.copyProperties(param, entity);
 
         OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
@@ -83,15 +83,15 @@ public class OrganizationController {
         entity.setUpdatedBy(oauthInfo.getId());
         entity.setId(this.sequenceService.nextId());
 
-        this.organizationInfoService.save(entity);
+        this.categoryOrganizationService.save(entity);
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "cultural.tourism.organization.edit", tags = "更新文旅机构")
+    @Permission(value = "category.organization.edit", tags = "更新文旅机构目录")
     @PostMapping("/updateById")
-    public Result updateById(Long id, @Valid @RequestBody SaveOrganizationInfoParam param) {
-        OrganizationInfo entity = new OrganizationInfo();
+    public Result updateById(Long id, @Valid @RequestBody SaveCategoryOrganizationParam param) {
+        CategoryOrganization entity = new CategoryOrganization();
         BeanUtils.copyProperties(param, entity);
 
         OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
@@ -99,15 +99,15 @@ public class OrganizationController {
         entity.setUpdatedTime(DateUtil.current());
         entity.setId(id);
 
-        this.organizationInfoService.updateById(entity);
+        this.categoryOrganizationService.updateById(entity);
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "cultural.tourism.organization.delete", tags = "删除文旅机构")
+    @Permission(value = "category.organization.delete", tags = "删除文旅机构目录")
     @PostMapping("/deleteByIds")
     public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.organizationInfoService.removeByIds(ids);
+        this.categoryOrganizationService.removeByIds(ids);
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 }

src/main/java/com/zhiqiyun/open/mvc/controller/UploaderController.java

@@ -82,6 +82,13 @@ public class UploaderController {
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
+    @Permission(value = "statistics.file.manage", tags = "删除多媒体信息")
+    @PostMapping("/deleteByIds")
+    public Result deleteByIds(@RequestBody List<Long> ids) {
+        this.uploadFileInfoService.removeByIds(ids);
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+
     @Permission(tags = "上传图片", writeLog = false)
     @PostMapping(value = "/handle/base64File")
     public Object handleBase64File(@RequestBody UploaderBase64Param param) throws IOException {

src/main/java/com/zhiqiyun/open/mvc/params/cultural/tourism/QueryOrganizationInfoParam.java → src/main/java/com/zhiqiyun/open/mvc/params/category/QueryCategoryOrganizationParam.java

@@ -1,10 +1,12 @@
-package com.zhiqiyun.open.mvc.params.cultural.tourism;
+package com.zhiqiyun.open.mvc.params.category;
 
 import com.zhiqiyun.open.mvc.params.QueryPageParams;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class QueryOrganizationInfoParam extends QueryPageParams {
+public class QueryCategoryOrganizationParam extends QueryPageParams {
     private String name;
     private String socialCode;
     private String legalPersonName;

src/main/java/com/zhiqiyun/open/mvc/params/cultural/tourism/SaveOrganizationInfoParam.java → src/main/java/com/zhiqiyun/open/mvc/params/category/SaveCategoryOrganizationParam.java

@@ -1,11 +1,11 @@
-package com.zhiqiyun.open.mvc.params.cultural.tourism;
+package com.zhiqiyun.open.mvc.params.category;
 
 import lombok.Data;
 
 import java.math.BigDecimal;
 
 @Data
-public class SaveOrganizationInfoParam {
+public class SaveCategoryOrganizationParam {
 
     private String name;
     private String socialCode;

src/main/resources/db/migration/V1.0.6__cultural_tourism.sql

@@ -1,7 +1,7 @@
 ALTER TABLE `authority_info` CHANGE COLUMN `name` `name` VARCHAR (100) NOT NULL COMMENT '权限名称';
 
-DROP TABLE IF EXISTS `cultural_tourism_organization_info`;
-CREATE TABLE `cultural_tourism_organization_info`
+DROP TABLE IF EXISTS `category_organization`;
+CREATE TABLE `category_organization`
 (
     `id`                     BIGINT(20) NOT NULL COMMENT 'ID',
     `name`                   VARCHAR(50)    NOT NULL COMMENT '公司名称',
@@ -21,15 +21,15 @@ CREATE TABLE `cultural_tourism_organization_info`
     `updated_time`           DATETIME NULL DEFAULT NULL COMMENT '修改时间',
     `updated_by`             BIGINT(20) NULL DEFAULT NULL COMMENT '修改人',
     PRIMARY KEY (`id`)
-) COMMENT ='文旅机构管理' ENGINE = InnoDB;
+) COMMENT ='机构目录管理' ENGINE = InnoDB;
 
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (2200, 0, 'cultural.tourism.organization', '文旅机构管理'),
-       (2201, 2200, 'cultural.tourism.organization.find', '查询'),
-       (2202, 2200, 'cultural.tourism.organization.add', '添加'),
-       (2203, 2200, 'cultural.tourism.organization.edit', '修改'),
-       (2204, 2200, 'cultural.tourism.organization.delete', '删除');
+VALUES (2200, 0, 'category.organization', '机构目录管理'),
+       (2201, 2200, 'category.organization.find', '查询'),
+       (2202, 2200, 'category.organization.add', '添加'),
+       (2203, 2200, 'category.organization.edit', '修改'),
+       (2204, 2200, 'category.organization.delete', '删除');
 
 
 DROP TABLE IF EXISTS `category_occupation`;