update

src/main/java/com/zhiqiyun/open/core/mapper/category/CategoryMaterialMapper.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.CategoryMaterial;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CategoryMaterialMapper extends BaseMapper<CategoryMaterial> {
+}

src/main/java/com/zhiqiyun/open/core/mapper/category/CategoryOccupationMapper.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.CategoryOccupation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CategoryOccupationMapper extends BaseMapper<CategoryOccupation> {
+}

src/main/java/com/zhiqiyun/open/core/mapper/cultural/tourism/OccupationInfoMapper.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.OccupationInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface OccupationInfoMapper extends BaseMapper<OccupationInfo> {
-}

src/main/java/com/zhiqiyun/open/core/models/cultural/tourism/OccupationInfo.java → src/main/java/com/zhiqiyun/open/core/models/category/CategoryMaterial.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.TableName;
 import lombok.Data;
@@ -7,13 +7,14 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-@TableName("cultural_tourism_occupation_info")
-public class OccupationInfo implements Serializable {
+@TableName("category_material")
+public class CategoryMaterial implements Serializable {
 
     private static final long serialVersionUID = -1387167827315361132L;
 
     private Long id;
     private String name;
+    private Integer sortNumber;
     private String remark;
 
     private Date createdTime;
@@ -21,3 +22,4 @@ public class OccupationInfo implements Serializable {
     private Date updatedTime;
     private Long updatedBy;
 }
+

src/main/java/com/zhiqiyun/open/core/models/category/CategoryOccupation.java

@@ -0,0 +1,25 @@
+package com.zhiqiyun.open.core.models.category;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("category_occupation")
+public class CategoryOccupation  implements Serializable {
+
+    private static final long serialVersionUID = -1387167827315361132L;
+
+    private Long id;
+    private String name;
+    private Integer sortNumber;
+    private String remark;
+
+    private Date createdTime;
+    private Long createdBy;
+    private Date updatedTime;
+    private Long updatedBy;
+}
+

src/main/java/com/zhiqiyun/open/core/service/CategoryMaterialService.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.CategoryMaterial;
+
+public interface CategoryMaterialService extends IService<CategoryMaterial> {
+}

src/main/java/com/zhiqiyun/open/core/service/CategoryOccupationService.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.CategoryOccupation;
+
+public interface CategoryOccupationService extends IService<CategoryOccupation> {
+}

src/main/java/com/zhiqiyun/open/core/service/OccupationInfoService.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.OccupationInfo;
-
-public interface OccupationInfoService extends IService<OccupationInfo> {
-}

src/main/java/com/zhiqiyun/open/core/service/impl/CategoryMaterialServiceImpl.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.CategoryMaterialMapper;
+import com.zhiqiyun.open.core.models.category.CategoryMaterial;
+import com.zhiqiyun.open.core.service.CategoryMaterialService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CategoryMaterialServiceImpl extends ServiceImpl<CategoryMaterialMapper, CategoryMaterial> implements CategoryMaterialService {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/CategoryOccupationServiceImpl.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.CategoryOccupationMapper;
+import com.zhiqiyun.open.core.models.category.CategoryOccupation;
+import com.zhiqiyun.open.core.service.CategoryOccupationService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CategoryOccupationServiceImpl extends ServiceImpl<CategoryOccupationMapper, CategoryOccupation> implements CategoryOccupationService {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/OccupationInfoServiceImpl.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.OccupationInfoMapper;
-import com.zhiqiyun.open.core.models.cultural.tourism.OccupationInfo;
-import com.zhiqiyun.open.core.service.OccupationInfoService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class OccupationInfoServiceImpl extends ServiceImpl<OccupationInfoMapper, OccupationInfo> implements OccupationInfoService {
-}

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

@@ -0,0 +1,110 @@
+package com.zhiqiyun.open.mvc.controller;
+
+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.category.CategoryMaterial;
+import com.zhiqiyun.open.core.models.user.OauthInfo;
+import com.zhiqiyun.open.core.service.CategoryMaterialService;
+import com.zhiqiyun.open.core.service.OauthService;
+import com.zhiqiyun.open.core.service.SequenceService;
+import com.zhiqiyun.open.mvc.Result;
+import com.zhiqiyun.open.mvc.params.category.QueryCategoryMaterialParam;
+import com.zhiqiyun.open.mvc.params.category.SaveCategoryMaterialParam;
+import com.zhiqiyun.open.utils.DateUtil;
+import com.zhiqiyun.open.utils.ServletContext;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("/category/material")
+public class CategoryMaterialController {
+
+    @Autowired
+    private CategoryMaterialService categoryMaterialService;
+
+    @Autowired
+    private SequenceService sequenceService;
+
+    @Autowired
+    private OauthService oauthService;
+
+    @Permission(value = "category.material.find", tags = "查询物务资源目录")
+    @PostMapping("/findPage")
+    public Result findPage(@RequestBody QueryCategoryMaterialParam param) {
+
+        QueryWrapper<CategoryMaterial> wrapper = new QueryWrapper<>();
+
+        if (StringUtils.isNotBlank(param.getName())) {
+            wrapper.like("name", param.getName());
+        }
+        Page<CategoryMaterial> page = param.getPage();
+        page.addOrder(OrderItem.desc("id"));
+
+        Page<CategoryMaterial> resultData = this.categoryMaterialService.page(page, wrapper);
+
+        return Result.instance(Result.Code.SUCCESS).setData(resultData);
+    }
+
+    @Permission(value = "category.material.add", tags = "新建物务资源目录")
+    @PostMapping("/save")
+    public Result save(@Valid @RequestBody SaveCategoryMaterialParam param) throws Exception {
+
+        CategoryMaterial entity = new CategoryMaterial();
+        BeanUtils.copyProperties(param, entity);
+
+        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
+
+        if (param.getSortNumber() == null) {
+            entity.setSortNumber(0);
+        }
+
+        entity.setCreatedTime(DateUtil.current());
+        entity.setCreatedBy(oauthInfo.getId());
+
+        entity.setUpdatedTime(DateUtil.current());
+        entity.setUpdatedBy(oauthInfo.getId());
+        entity.setId(this.sequenceService.nextId());
+
+        this.categoryMaterialService.save(entity);
+
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+
+    @Permission(value = "category.material.edit", tags = "更新物务资源目录")
+    @PostMapping("/updateById")
+    public Result updateById(Long id, @Valid @RequestBody SaveCategoryMaterialParam param) {
+        CategoryMaterial entity = new CategoryMaterial();
+        BeanUtils.copyProperties(param, entity);
+
+        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
+
+        if (param.getSortNumber() == null) {
+            entity.setSortNumber(0);
+        }
+
+        entity.setUpdatedBy(oauthInfo.getId());
+        entity.setUpdatedTime(DateUtil.current());
+        entity.setId(id);
+
+        this.categoryMaterialService.updateById(entity);
+
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+
+    @Permission(value = "category.material.delete", tags = "删除物务资源目录")
+    @PostMapping("/deleteByIds")
+    public Result deleteByIds(@RequestBody List<Long> ids) {
+        this.categoryMaterialService.removeByIds(ids);
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+}

src/main/java/com/zhiqiyun/open/mvc/controller/OccupationInfoController.java → src/main/java/com/zhiqiyun/open/mvc/controller/CategoryOccupationController.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.OccupationInfo;
+import com.zhiqiyun.open.core.models.category.CategoryOccupation;
 import com.zhiqiyun.open.core.models.user.OauthInfo;
+import com.zhiqiyun.open.core.service.CategoryOccupationService;
 import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.OccupationInfoService;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.cultural.tourism.QueryOccupationInfoParam;
-import com.zhiqiyun.open.mvc.params.cultural.tourism.SaveOccupationInfoParam;
+import com.zhiqiyun.open.mvc.params.category.QueryCategoryOccupationParam;
+import com.zhiqiyun.open.mvc.params.category.SaveCategoryOccupationParam;
 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/occupation")
-public class OccupationInfoController {
+@RequestMapping("/category/occupation")
+public class CategoryOccupationController {
 
     @Autowired
-    private OccupationInfoService occupationInfoService;
+    private CategoryOccupationService categoryOccupationService;
 
     @Autowired
     private SequenceService sequenceService;
@@ -38,28 +38,28 @@ public class OccupationInfoController {
     @Autowired
     private OauthService oauthService;
 
-    @Permission(value = "cultural.tourism.occupation.find", tags = "查询文旅岗位目录")
+    @Permission(value = "category.occupation.find", tags = "查询文旅岗位目录")
     @PostMapping("/findPage")
-    public Result findPage(@RequestBody QueryOccupationInfoParam param) {
+    public Result findPage(@RequestBody QueryCategoryOccupationParam param) {
 
-        QueryWrapper<OccupationInfo> wrapper = new QueryWrapper<>();
+        QueryWrapper<CategoryOccupation> wrapper = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(param.getName())) {
             wrapper.like("name", param.getName());
         }
-        Page<OccupationInfo> page = param.getPage();
+        Page<CategoryOccupation> page = param.getPage();
         page.addOrder(OrderItem.desc("id"));
 
-        Page<OccupationInfo> resultData = this.occupationInfoService.page(page, wrapper);
+        Page<CategoryOccupation> resultData = this.categoryOccupationService.page(page, wrapper);
 
         return Result.instance(Result.Code.SUCCESS).setData(resultData);
     }
 
-    @Permission(value = "cultural.tourism.occupation.add", tags = "新建文旅岗位目录")
+    @Permission(value = "category.occupation.add", tags = "新建文旅岗位目录")
     @PostMapping("/save")
-    public Result save(@Valid @RequestBody SaveOccupationInfoParam param) throws Exception {
+    public Result save(@Valid @RequestBody SaveCategoryOccupationParam param) throws Exception {
 
-        OccupationInfo entity = new OccupationInfo();
+        CategoryOccupation entity = new CategoryOccupation();
         BeanUtils.copyProperties(param, entity);
 
         OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
@@ -71,15 +71,15 @@ public class OccupationInfoController {
         entity.setUpdatedBy(oauthInfo.getId());
         entity.setId(this.sequenceService.nextId());
 
-        this.occupationInfoService.save(entity);
+        this.categoryOccupationService.save(entity);
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "cultural.tourism.occupation.edit", tags = "更新文旅岗位目录")
+    @Permission(value = "category.occupation.edit", tags = "更新文旅岗位目录")
     @PostMapping("/updateById")
-    public Result updateById(Long id, @Valid @RequestBody SaveOccupationInfoParam param) {
-        OccupationInfo entity = new OccupationInfo();
+    public Result updateById(Long id, @Valid @RequestBody SaveCategoryOccupationParam param) {
+        CategoryOccupation entity = new CategoryOccupation();
         BeanUtils.copyProperties(param, entity);
 
         OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
@@ -87,15 +87,15 @@ public class OccupationInfoController {
         entity.setUpdatedTime(DateUtil.current());
         entity.setId(id);
 
-        this.occupationInfoService.updateById(entity);
+        this.categoryOccupationService.updateById(entity);
 
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 
-    @Permission(value = "cultural.tourism.occupation.delete", tags = "删除文旅岗位目录")
+    @Permission(value = "category.occupation.delete", tags = "删除文旅岗位目录")
     @PostMapping("/deleteByIds")
     public Result deleteByIds(@RequestBody List<Long> ids) {
-        this.occupationInfoService.removeByIds(ids);
+        this.categoryOccupationService.removeByIds(ids);
         return Result.instance(Result.Code.MESSAGE_SUCCESS);
     }
 }

src/main/java/com/zhiqiyun/open/mvc/params/cultural/tourism/QueryOccupationInfoParam.java → src/main/java/com/zhiqiyun/open/mvc/params/category/QueryCategoryMaterialParam.java

@@ -1,4 +1,4 @@
-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;
@@ -6,6 +6,6 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class QueryOccupationInfoParam extends QueryPageParams {
+public class QueryCategoryMaterialParam extends QueryPageParams {
     private String name;
 }

src/main/java/com/zhiqiyun/open/mvc/params/category/QueryCategoryOccupationParam.java

@@ -0,0 +1,11 @@
+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 QueryCategoryOccupationParam extends QueryPageParams {
+    private String name;
+}

src/main/java/com/zhiqiyun/open/mvc/params/category/SaveCategoryMaterialParam.java

@@ -0,0 +1,10 @@
+package com.zhiqiyun.open.mvc.params.category;
+
+import lombok.Data;
+
+@Data
+public class SaveCategoryMaterialParam {
+    private String name;
+    private String remark;
+    private Integer sortNumber;
+}

src/main/java/com/zhiqiyun/open/mvc/params/category/SaveCategoryOccupationParam.java

@@ -0,0 +1,10 @@
+package com.zhiqiyun.open.mvc.params.category;
+
+import lombok.Data;
+
+@Data
+public class SaveCategoryOccupationParam {
+    private String name;
+    private String remark;
+    private Integer sortNumber;
+}

src/main/java/com/zhiqiyun/open/mvc/params/cultural/tourism/SaveOccupationInfoParam.java

@@ -1,11 +0,0 @@
-package com.zhiqiyun.open.mvc.params.cultural.tourism;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class SaveOccupationInfoParam {
-    private String name;
-    private String remark;
-}

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

@@ -32,11 +32,12 @@ VALUES (2200, 0, 'cultural.tourism.organization', '文旅机构管理'),
        (2204, 2200, 'cultural.tourism.organization.delete', '删除');
 
 
-DROP TABLE IF EXISTS `cultural_tourism_occupation_info`;
-CREATE TABLE `cultural_tourism_occupation_info`
+DROP TABLE IF EXISTS `category_occupation`;
+CREATE TABLE `category_occupation`
 (
     `id`           BIGINT(20) NOT NULL COMMENT 'ID',
     `name`         VARCHAR(50) NOT NULL COMMENT '岗位目录名称',
+    `sort_number`  INT(11) NOT NULL COMMENT '排序ID',
     `remark`       TEXT        NOT NULL COMMENT '备注说明',
     `created_time` DATETIME NULL DEFAULT NULL COMMENT '创建时间',
     `created_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '创建人',
@@ -47,8 +48,31 @@ CREATE TABLE `cultural_tourism_occupation_info`
 
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (2300, 0, 'cultural.tourism.occupation', '文旅岗位目录管理'),
-       (2301, 2300, 'cultural.tourism.occupation.find', '查询'),
-       (2302, 2300, 'cultural.tourism.occupation.add', '添加'),
-       (2303, 2300, 'cultural.tourism.occupation.edit', '修改'),
-       (2304, 2300, 'cultural.tourism.occupation.delete', '删除');
+VALUES (2300, 0, 'category.occupation', '文旅岗位目录管理'),
+       (2301, 2300, 'category.occupation.find', '查询'),
+       (2302, 2300, 'category.occupation.add', '添加'),
+       (2303, 2300, 'category.occupation.edit', '修改'),
+       (2304, 2300, 'category.occupation.delete', '删除');
+
+
+DROP TABLE IF EXISTS `category_material`;
+CREATE TABLE `category_material`
+(
+    `id`           BIGINT(20) NOT NULL COMMENT 'ID',
+    `name`         VARCHAR(50) NOT NULL COMMENT '物务资源目录名称',
+    `sort_number`  INT(11) NOT NULL COMMENT '排序ID',
+    `remark`       TEXT        NOT NULL COMMENT '备注说明',
+    `created_time` DATETIME NULL DEFAULT NULL COMMENT '创建时间',
+    `created_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '创建人',
+    `updated_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间',
+    `updated_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '修改人',
+    PRIMARY KEY (`id`)
+) COMMENT ='文旅岗位目录管理' ENGINE = InnoDB;
+
+REPLACE
+INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
+VALUES (2400, 0, 'category.material', '文旅岗位目录管理'),
+       (2401, 2400, 'category.material.find', '查询'),
+       (2402, 2400, 'category.material.add', '添加'),
+       (2403, 2400, 'category.material.edit', '修改'),
+       (2404, 2400, 'category.material.delete', '删除');