diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 3385a854a..d75163837 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.apache.shiro.SecurityUtils; import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; @@ -16,6 +14,10 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.model.TreeSelectModel; import com.jero.modules.system.service.ISysCategoryService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -89,8 +91,23 @@ public class SysCategoryController { result.setResult(list); return result; } - - + + /**通过字典id查询 + * + * @param sysDictId + * @return + */ + @AutoLog(value = "标签内容-树形结构-通过sysDictId查询") + @ApiOperation(value="标签内容-树形结构-通过sysDictId查询", notes="标签内容-树形结构-通过sysDictId查询") + @GetMapping(value = "/queryBySysDictId") + public Result queryBySysDictId(@RequestParam(name="id",required=true) String sysDictId) { + List sysCategory = sysCategoryService.queryBySysDictId(sysDictId); + if(sysCategory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(sysCategory); + } + /** * 添加 * @param sysCategory diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index f5833247d..af19e34f9 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -1,13 +1,12 @@ package com.jero.modules.system.service; -import java.util.List; -import java.util.Map; - +import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.exception.JeroBootException; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.model.TreeSelectModel; -import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; +import java.util.Map; /** * @Description: 分类字典 @@ -58,5 +57,11 @@ public interface ISysCategoryService extends IService { * @param ids */ void deleteSysCategory(String ids); - + + /**通过字典id查询 + * + * @param sysDictId + * @return + */ + List queryBySysDictId(String sysDictId); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index f216f32a7..cbaa96bbb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -1,27 +1,26 @@ package com.jero.modules.system.service.impl; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.FillRuleConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.util.FillRuleUtil; -import com.jero.common.util.YouBianCodeUtil; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.model.TreeSelectModel; import com.jero.modules.system.service.ISysCategoryService; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + /** * @Description: 分类字典 * @Author: jero-boot @@ -204,4 +203,15 @@ public class SysCategoryServiceImpl extends ServiceImpl queryBySysDictId(String sysDictId) { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("sys_dict_id",sysDictId); + return list(queryWrapper); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java index 3e26ea4fe..128769466 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java @@ -10,7 +10,6 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.modules.collection.entity.OnlCgformCollection; import com.jero.modules.collection.service.IOnlCgformCollectionService; import com.jero.modules.document.controller.BussDocumentLibraryEOController; -import com.jero.modules.document.entity.BussDocumentLibraryEO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/controller/OnlCgformSubscribeController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/controller/OnlCgformSubscribeController.java new file mode 100644 index 000000000..2286b20c5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/controller/OnlCgformSubscribeController.java @@ -0,0 +1,171 @@ +package com.jero.modules.subscribe.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.subscribe.entity.OnlCgformSubscribe; +import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + + + /** + * @Description: 我的订阅 + * @Author: jero-boot + * @Date: 2022-02-23 + * @Version: V1.0 + */ +@Api(tags="我的订阅") +@RestController +@RequestMapping("/subscribe/onlCgformSubscribe") +@Slf4j +public class OnlCgformSubscribeController extends JeroController { + @Autowired + private IOnlCgformSubscribeService onlCgformSubscribeService; + + /** + * 分页列表查询 + * + * @param onlCgformSubscribe + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "我的订阅-分页列表查询") + @ApiOperation(value="我的订阅-分页列表查询", notes="我的订阅-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OnlCgformSubscribe onlCgformSubscribe, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(onlCgformSubscribe, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = onlCgformSubscribeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "我的订阅-列表查询") + @ApiOperation(value="我的订阅-列表查询", notes="我的订阅-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = onlCgformSubscribeService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param onlCgformSubscribe + * @return + */ + @AutoLog(value = "我的订阅-添加") + @ApiOperation(value="我的订阅-添加", notes="我的订阅-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OnlCgformSubscribe onlCgformSubscribe) { + onlCgformSubscribeService.add(onlCgformSubscribe); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param onlCgformSubscribe + * @return + */ + @AutoLog(value = "我的订阅-编辑") + @ApiOperation(value="我的订阅-编辑", notes="我的订阅-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OnlCgformSubscribe onlCgformSubscribe) { + onlCgformSubscribeService.editById(onlCgformSubscribe); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "我的订阅-通过id删除") + @ApiOperation(value="我的订阅-通过id删除", notes="我的订阅-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + onlCgformSubscribeService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "我的订阅-批量删除") + @ApiOperation(value="我的订阅-批量删除", notes="我的订阅-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.onlCgformSubscribeService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "我的订阅-通过id查询") + @ApiOperation(value="我的订阅-通过id查询", notes="我的订阅-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + OnlCgformSubscribe onlCgformSubscribe = onlCgformSubscribeService.queryById(id); + if(onlCgformSubscribe==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(onlCgformSubscribe); + } + + /** + * 导出excel + * + * @param request + * @param onlCgformSubscribe + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OnlCgformSubscribe onlCgformSubscribe) { + return super.exportXls(request, onlCgformSubscribe, OnlCgformSubscribe.class, "我的订阅"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, OnlCgformSubscribe.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/entity/OnlCgformSubscribe.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/entity/OnlCgformSubscribe.java new file mode 100644 index 000000000..0bdee41a5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/entity/OnlCgformSubscribe.java @@ -0,0 +1,89 @@ +package com.jero.modules.subscribe.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: 我的订阅 + * @Author: jero-boot + * @Date: 2022-02-23 + * @Version: V1.0 + */ +@Data +@TableName("onl_cgform_subscribe") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="onl_cgform_subscribe对象", description="我的订阅") +public class OnlCgformSubscribe implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**订阅人*/ + @ApiModelProperty(value = "订阅人") + private String createBy; + + /**订阅日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "订阅日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**文档库id*/ + @Excel(name = "文档库id", width = 15, dictTable = "buss_document_library", dicText = "id", dicCode = "id") + @Dict(dictTable = "buss_document_library", dicText = "id", dicCode = "id") + private String documentId; + + /**状态*/ + @Excel(name = "状态", width = 15, dictTable = "buss_document_library", dicText = "state", dicCode = "state") + @Dict(dictTable = "buss_document_library", dicText = "state", dicCode = "state") + private String state; + + /**编号*/ + @Excel(name = "编号", width = 15, dictTable = "buss_document_library", dicText = "serialNumber", dicCode = "serialNumber") + @Dict(dictTable = "buss_document_library", dicText = "serialNumber", dicCode = "serialNumber") + private String serialNumber; + + /**标题*/ + @Excel(name = "标题", width = 15, dictTable = "buss_document_library", dicText = "title", dicCode = "title") + @Dict(dictTable = "buss_document_library", dicText = "title", dicCode = "title") + @ApiModelProperty(value = "标题") + private String title; + + /**技术领域*/ + @Excel(name = "技术领域", width = 15) + @Dict(dicCode = "technology_territory") + @ApiModelProperty(value = "技术领域") + private String technologyTerritory; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java new file mode 100644 index 000000000..100892a4a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.subscribe.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.subscribe.entity.OnlCgformSubscribe; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 我的订阅 + * @Author: jero-boot + * @Date: 2022-02-23 + * @Version: V1.0 + */ +public interface OnlCgformSubscribeMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml new file mode 100644 index 000000000..9ea4e8ad1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/IOnlCgformSubscribeService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/IOnlCgformSubscribeService.java new file mode 100644 index 000000000..90378406e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/IOnlCgformSubscribeService.java @@ -0,0 +1,61 @@ +package com.jero.modules.subscribe.service; + +import com.jero.modules.subscribe.entity.OnlCgformSubscribe; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 我的订阅 + * @Author: jero-boot + * @Date: 2022-02-23 + * @Version: V1.0 + */ +public interface IOnlCgformSubscribeService extends IService { + + /** + * 保存 + * + * @param onlCgformSubscribe + * @return + */ + void add(OnlCgformSubscribe onlCgformSubscribe); + + /** + * 更新 + * + * @param onlCgformSubscribe + * @return + */ + void editById(OnlCgformSubscribe onlCgformSubscribe); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OnlCgformSubscribe queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java new file mode 100644 index 000000000..af780be56 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.subscribe.service.impl; + +import com.jero.modules.subscribe.entity.OnlCgformSubscribe; +import com.jero.modules.subscribe.mapper.OnlCgformSubscribeMapper; +import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 我的订阅 + * @Author: jero-boot + * @Date: 2022-02-23 + * @Version: V1.0 + */ +@Service +public class OnlCgformSubscribeServiceImpl extends ServiceImpl implements IOnlCgformSubscribeService { + + /** + * 保存 + * + * @param onlCgformSubscribe + * @return + */ + @Override + public void add(OnlCgformSubscribe onlCgformSubscribe) { + Date now = new Date(); + onlCgformSubscribe.setCreateTime(now); + onlCgformSubscribe.setUpdateTime(now); + save(onlCgformSubscribe); + } + + /** + * 更新 + * + * @param onlCgformSubscribe + * @return + */ + @Override + public void editById(OnlCgformSubscribe onlCgformSubscribe) { + Date now = new Date(); + onlCgformSubscribe.setUpdateTime(now); + saveOrUpdate(onlCgformSubscribe); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OnlCgformSubscribe queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +}