Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-cloud into service-job-08

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/HceArticleController.java

@@ -0,0 +1,80 @@
+package com.usky.system.controller.web;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.system.domain.HceArticle;
+import com.usky.system.domain.HceCategory;
+import com.usky.system.service.HceArticleService;
+import com.usky.system.service.vo.HceArticleVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.stereotype.Controller;
+import retrofit2.http.POST;
+
+/**
+ * <p>
+ * 帮助中心_内容管理 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-30
+ */
+@RestController
+@RequestMapping("/hceArticle")
+public class HceArticleController {
+
+    @Autowired
+    private HceArticleService hceArticleService;
+
+    /**
+     * 帮助中心-内容管理列表
+     * @param hceArticleVO
+     * @return
+     */
+    @PostMapping("page")
+    ApiResult<CommonPage<HceArticle>> page(@RequestBody HceArticleVO hceArticleVO){
+        return ApiResult.success(hceArticleService.page(hceArticleVO));
+    }
+
+    /**
+     * 帮助中心-内容管理新增
+     * @param hceArticle
+     * @return
+     */
+    @PostMapping
+    ApiResult<Void> add(@RequestBody HceArticle hceArticle){
+        hceArticleService.add(hceArticle);
+        return ApiResult.success();
+    }
+
+    /**
+     * 帮助中心-内容管理更新
+     * @param hceArticle
+     * @return
+     */
+    @PutMapping
+    ApiResult<Void> update(@RequestBody HceArticle hceArticle){
+        hceArticleService.update(hceArticle);
+        return ApiResult.success();
+    }
+
+    /**
+     * 帮助中心-内容管理删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    ApiResult<Void> remove(@PathVariable("id") Integer id){
+        hceArticleService.remove(id);
+        return ApiResult.success();
+    }
+
+}
+

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/HceCategoryController.java

@@ -0,0 +1,76 @@
+package com.usky.system.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.system.domain.HceCategory;
+import com.usky.system.service.HceCategoryService;
+import com.usky.system.service.vo.HceCategoryVO;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.stereotype.Controller;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 帮助中心_栏目管理 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-29
+ */
+@RestController
+@RequestMapping("/hceCategory")
+public class HceCategoryController {
+
+    @Autowired
+    private HceCategoryService hceCategoryService;
+
+    /**
+     * 帮助中心-栏目管理列表
+     *
+     * @param hceCategoryVO
+     * @return
+     */
+    @PostMapping("page")
+    public ApiResult<List<HceCategory>> page(@RequestBody HceCategoryVO hceCategoryVO){
+        return ApiResult.success(hceCategoryService.page(hceCategoryVO));
+    }
+
+    /**
+     * 帮助中心-栏目管理新增
+     * @param hceCategory
+     * @return
+     */
+    @PostMapping
+    ApiResult<Void> add(@RequestBody HceCategory hceCategory){
+        hceCategoryService.add(hceCategory);
+        return ApiResult.success();
+    }
+
+    /**
+     * 帮助中心-栏目管理更新
+     * @param hceCategory
+     * @return
+     */
+    @PutMapping
+    ApiResult<Void> update(@RequestBody HceCategory hceCategory){
+        hceCategoryService.update(hceCategory);
+        return ApiResult.success();
+    }
+
+    /**
+     * 帮助中心-栏目管理删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    ApiResult<Void> remove(@PathVariable("id") Integer id){
+        hceCategoryService.remove(id);
+        return ApiResult.success();
+    }
+
+}
+

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/HceArticle.java

@@ -0,0 +1,93 @@
+package com.usky.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 帮助中心_内容管理
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class HceArticle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 内容标题;
+     */
+    private String title;
+
+    /**
+     * 作者
+     */
+    private String author;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 点击量;
+     */
+    private Integer hits;
+
+    /**
+     * 内容文件路径
+     */
+    private String htmlfilepath;
+
+    /**
+     * 是否置顶;0:否 1:是
+     */
+    private Integer istop;
+
+    /**
+     * 栏目ID
+     */
+    private Integer categoryid;
+
+    /**
+     * 内容图片;
+     */
+    private String image;
+
+    /**
+     * 内容副标题;
+     */
+    private String lmtitle;
+
+    /**
+     * 内容摘要;
+     */
+    private String zhaiyao;
+
+    /**
+     * 创建时间;
+     */
+    private LocalDateTime createdate;
+
+    /**
+     * 修改时间;
+     */
+    private LocalDateTime modifydate;
+
+    /**
+     * 栏目名称
+     */
+    @TableField(exist = false)
+    private String categoryName;
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/HceCategory.java

@@ -0,0 +1,94 @@
+package com.usky.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 帮助中心_栏目管理
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class HceCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 父级ID
+     */
+    private Integer pid;
+
+    /**
+     * 栏目名称
+     */
+    private String categoryName;
+
+    /**
+     * 是否新栏目;0:否 1:是
+     */
+    @TableField("isNew")
+    private Integer isNew;
+
+    /**
+     * 栏目图片;
+     */
+    @TableField("imagePath")
+    private String imagePath;
+
+    /**
+     * 创建时间;
+     */
+    private LocalDateTime createdate;
+
+    /**
+     * 修改时间;
+     */
+    private LocalDateTime modifydate;
+
+    /**
+     * 栏目排序
+     */
+    private Integer sortindex;
+
+    /**
+     * 状态;0:关闭 1:开启
+     */
+    private Integer status;
+
+    /**
+     * 映射菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 菜单ID
+     */
+    private Integer menuId;
+
+    /**
+     * 栏目描述
+     */
+    private String description;
+
+    /**
+     * 子级
+     */
+    @TableField(exist = false)
+    private List<HceCategory> children;
+
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/HceArticleMapper.java

@@ -0,0 +1,16 @@
+package com.usky.system.mapper;
+
+import com.usky.system.domain.HceArticle;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 帮助中心_内容管理 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-30
+ */
+public interface HceArticleMapper extends CrudMapper<HceArticle> {
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/HceCategoryMapper.java

@@ -0,0 +1,16 @@
+package com.usky.system.mapper;
+
+import com.usky.system.domain.HceCategory;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 帮助中心_栏目管理 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-29
+ */
+public interface HceCategoryMapper extends CrudMapper<HceCategory> {
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/HceArticleService.java

@@ -0,0 +1,26 @@
+package com.usky.system.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.system.domain.HceArticle;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.system.domain.HceCategory;
+import com.usky.system.service.vo.HceArticleVO;
+
+/**
+ * <p>
+ * 帮助中心_内容管理 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-30
+ */
+public interface HceArticleService extends CrudService<HceArticle> {
+
+    CommonPage<HceArticle> page(HceArticleVO hceArticleVO);
+
+    void add(HceArticle hceArticle);
+
+    void update(HceArticle hceArticle);
+
+    void remove(Integer id);
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/HceCategoryService.java

@@ -0,0 +1,28 @@
+package com.usky.system.service;
+
+import com.usky.system.domain.HceCategory;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.system.service.vo.HceCategoryVO;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 帮助中心_栏目管理 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-29
+ */
+public interface HceCategoryService extends CrudService<HceCategory> {
+
+    List<HceCategory> page(HceCategoryVO hceCategoryVO);
+
+    void add(HceCategory hceCategory);
+
+    void update(HceCategory hceCategory);
+
+    void remove(Integer id);
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysLoginService.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
@@ -141,6 +142,11 @@ public class SysLoginService {
             //查询用户信息
             loginUser = sysUserService.getAppUserInfo(username, tenantId, null);
 
+            if (Objects.isNull(loginUser)) {
+                recordLogininfor(username, Constants.LOGIN_FAIL, "用户不存在");
+                throw new BusinessException("用户不存在");
+            }
+
             if (!SecurityUtils.matchesPassword(password, loginUser.getPassword())) {
                 recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
                 throw new BusinessException("用户不存在/密码错误");

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceArticleServiceImpl.java

@@ -0,0 +1,100 @@
+package com.usky.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.system.domain.HceArticle;
+import com.usky.system.domain.HceCategory;
+import com.usky.system.mapper.HceArticleMapper;
+import com.usky.system.mapper.HceCategoryMapper;
+import com.usky.system.service.HceArticleService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.system.service.vo.HceArticleVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 帮助中心_内容管理 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-30
+ */
+@Service
+public class HceArticleServiceImpl extends AbstractCrudService<HceArticleMapper, HceArticle> implements HceArticleService {
+    @Resource
+    private HceCategoryMapper hceCategoryMapper;
+
+    @Override
+    public CommonPage<HceArticle> page(HceArticleVO hceArticleVO){
+        IPage<HceArticle> page = new Page<>(hceArticleVO.getPageNum(),hceArticleVO.getPageSize());
+
+        LambdaQueryWrapper<HceArticle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(hceArticleVO.getCategoryid() != null,HceArticle::getCategoryid,hceArticleVO.getCategoryid())
+                .like(StringUtils.isNotBlank(hceArticleVO.getTitle()),HceArticle::getTitle,hceArticleVO.getTitle())
+                .between(StringUtils.isNotBlank(hceArticleVO.getStartTime()) && StringUtils.isNotBlank(hceArticleVO.getEndTime()),HceArticle::getCreatedate,hceArticleVO.getStartTime(),hceArticleVO.getEndTime())
+                .orderByDesc(HceArticle::getIstop, HceArticle::getId);
+        page = this.page(page,queryWrapper);
+        if(page.getRecords().size() > 0){
+            LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.eq(HceCategory::getStatus,1)
+                    .orderByDesc(HceCategory::getSortindex);
+            List<HceCategory> list = hceCategoryMapper.selectList(queryWrapper1);
+            if(CollectionUtils.isNotEmpty(list)){
+                for(int i=0;i<page.getRecords().size();i++){
+                    for(int j=0;j<list.size();j++){
+                        Integer categoryId1 = page.getRecords().get(i).getCategoryid();
+                        Integer categoryId2 = list.get(j).getId();
+                        if(categoryId1.equals(categoryId2)){
+                            page.getRecords().get(i).setCategoryName(list.get(j).getCategoryName());
+                        }
+                    }
+                }
+            }
+
+        }
+
+        return new CommonPage<>(page.getRecords(),page.getTotal(),hceArticleVO.getPageSize(),hceArticleVO.getPageNum());
+    }
+
+    public void add(HceArticle hceArticle){
+
+        LambdaQueryWrapper<HceArticle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(HceArticle::getCategoryid,hceArticle.getCategoryid())
+                .eq(HceArticle::getTitle,hceArticle.getTitle());
+        List<HceArticle> list = this.list(queryWrapper);
+        if(list.size() > 0){
+            throw new BusinessException("同一个栏目下面内容标题重复，请重新填写内容标题");
+        }
+        hceArticle.setCreatedate(LocalDateTime.now());
+        this.save(hceArticle);
+    }
+
+    public void update(HceArticle hceArticle){
+        LambdaQueryWrapper<HceArticle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(HceArticle::getCategoryid,hceArticle.getCategoryid())
+                .eq(HceArticle::getTitle,hceArticle.getTitle())
+                .ne(HceArticle::getId,hceArticle.getId());
+        List<HceArticle> list = this.list(queryWrapper);
+        if(list.size() > 0){
+            throw new BusinessException("同一个栏目下面内容标题重复，请重新填写内容标题");
+        }
+        hceArticle.setModifydate(LocalDateTime.now());
+        this.updateById(hceArticle);
+    }
+
+    public void remove(Integer id){
+        this.removeById(id);
+
+    }
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceCategoryServiceImpl.java

@@ -0,0 +1,109 @@
+package com.usky.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.system.domain.HceArticle;
+import com.usky.system.domain.HceCategory;
+import com.usky.system.mapper.HceArticleMapper;
+import com.usky.system.mapper.HceCategoryMapper;
+import com.usky.system.service.HceArticleService;
+import com.usky.system.service.HceCategoryService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.system.service.vo.HceCategoryVO;
+import org.apache.tomcat.jni.Local;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 帮助中心_栏目管理 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-08-29
+ */
+@Service
+public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMapper, HceCategory> implements HceCategoryService {
+    @Resource
+    private HceArticleMapper hceArticleMapper;
+
+    @Override
+    public List<HceCategory> page(HceCategoryVO hceCategoryVO){
+        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(HceCategory::getStatus,1)
+                .like(StringUtils.isNotBlank(hceCategoryVO.getCategoryName()), HceCategory::getCategoryName,hceCategoryVO.getCategoryName())
+                .in(hceCategoryVO.getMenuIdList() != null,HceCategory::getMenuId,hceCategoryVO.getMenuIdList())
+                .between(StringUtils.isNotBlank(hceCategoryVO.getStartTime()) && StringUtils.isNotBlank(hceCategoryVO.getEndTime()),HceCategory::getCreatedate,hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime())
+                .orderByAsc(HceCategory::getSortindex);
+        List<HceCategory> list = this.list(queryWrapper);
+        List<HceCategory> list1 = list.stream().filter(s ->s.getPid() == 0).map(
+                menu->{menu.setChildren(getChildrenData(menu,list));
+                    return menu;
+                }
+        ).collect(Collectors.toList());
+
+        return list1;
+    }
+
+    private List<HceCategory> getChildrenData(HceCategory parent, List<HceCategory> all){
+        List<HceCategory> children = all.stream().filter(s ->s.getPid() == parent.getId()).map(
+                menu->{
+                    menu.setChildren(getChildrenData(menu,all));
+                    return menu;
+                }
+        ).collect(Collectors.toList());
+        return children;
+    }
+
+    public void add(HceCategory hceCategory){
+        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(HceCategory::getStatus,1)
+                .eq(HceCategory::getPid,hceCategory.getPid())
+                .eq(HceCategory::getCategoryName,hceCategory.getCategoryName());
+        List<HceCategory> list = this.list(queryWrapper);
+        if(list.size() > 0){
+            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
+        }
+        hceCategory.setCreatedate(LocalDateTime.now());
+        hceCategory.setStatus(1);
+        this.save(hceCategory);
+    }
+
+    public void update(HceCategory hceCategory){
+        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(HceCategory::getStatus,1)
+                .eq(HceCategory::getPid,hceCategory.getPid())
+                .eq(HceCategory::getCategoryName,hceCategory.getCategoryName())
+                .ne(HceCategory::getId,hceCategory.getId());
+        List<HceCategory> list = this.list(queryWrapper);
+        if(list.size() > 0){
+            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
+        }
+        hceCategory.setModifydate(LocalDateTime.now());
+        this.updateById(hceCategory);
+    }
+
+    public void remove(Integer id){
+        if(id == null || id == 0){
+            throw new BusinessException("栏目id不能为空或者等于0");
+        }
+        LambdaQueryWrapper<HceArticle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(HceArticle::getCategoryid,id);
+        List<HceArticle> list = hceArticleMapper.selectList(queryWrapper);
+        if(list.size() > 0){
+            throw new BusinessException("该栏目存在栏目内容不可删除");
+        }
+        this.removeById(id);
+
+    }
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.usky.system.service.impl;
 
 
+import com.usky.common.core.constants.Constants;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
@@ -502,9 +503,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
             sysUser = userMapper.selectUserDataOne(tenantId,phone);
         }
 
-        if (Objects.isNull(sysUser)) {
-            throw new BusinessException("用户信息/密码不存在");
-        }
+
         return sysUser;
     }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/HceArticleVO.java

@@ -0,0 +1,38 @@
+package com.usky.system.service.vo;
+
+import lombok.Data;
+
+@Data
+public class HceArticleVO {
+    /**
+     * 栏目ID
+     */
+    private Integer categoryid;
+
+    /**
+     * 内容标题;
+     */
+    private String title;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 当前页
+     *
+     */
+    private Integer pageNum;
+
+    /**
+     * 每页条数
+     */
+    private Integer pageSize;
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/HceCategoryVO.java

@@ -0,0 +1,29 @@
+package com.usky.system.service.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HceCategoryVO {
+
+    /**
+     * 栏目名称
+     */
+    private String categoryName;
+
+    /**
+     * 菜单Id集合
+     */
+    private List<Integer> menuIdList;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+}

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/HceArticleMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.system.mapper.HceArticleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.system.domain.HceArticle">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="author" property="author" />
+        <result column="content" property="content" />
+        <result column="hits" property="hits" />
+        <result column="htmlfilepath" property="htmlfilepath" />
+        <result column="istop" property="istop" />
+        <result column="categoryid" property="categoryid" />
+        <result column="image" property="image" />
+        <result column="lmtitle" property="lmtitle" />
+        <result column="zhaiyao" property="zhaiyao" />
+        <result column="createdate" property="createdate" />
+        <result column="modifydate" property="modifydate" />
+    </resultMap>
+
+</mapper>

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/HceCategoryMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.system.mapper.HceCategoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.system.domain.HceCategory">
+        <id column="id" property="id" />
+        <result column="pid" property="pid" />
+        <result column="category_name" property="categoryName" />
+        <result column="isNew" property="isNew" />
+        <result column="imagePath" property="imagePath" />
+        <result column="createdate" property="createdate" />
+        <result column="modifydate" property="modifydate" />
+        <result column="sortindex" property="sortindex" />
+        <result column="status" property="status" />
+        <result column="menu_name" property="menuName" />
+        <result column="menu_id" property="menuId" />
+        <result column="description" property="description" />
+    </resultMap>
+
+</mapper>