diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateGroup.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateGroup.java index 5d594175..42227a59 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateGroup.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateGroup.java @@ -1,8 +1,13 @@ package com.cloud.kicc.system.api.devtools.entity; +import cn.hutool.core.collection.ListUtil; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; import java.io.Serializable; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,6 +15,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import org.apache.commons.compress.utils.Lists; /** *

@@ -40,4 +46,7 @@ public class GencodeTemplateGroup extends CommonEntity { @ApiModelProperty("是否系统表") private String isSystem; + @TableField(exist = false) + private List genCodeTemplateObjList = ListUtil.empty(); + } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ImSessionController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ImSessionController.java index bc8478ed..bdd71b9e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ImSessionController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ImSessionController.java @@ -11,11 +11,9 @@ import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.exception.CheckedException; import com.cloud.kicc.common.security.annotation.Inner; import com.cloud.kicc.common.security.util.SecurityUtils; -import com.cloud.kicc.system.api.entity.ImContent; import com.cloud.kicc.system.api.entity.ImSession; import com.cloud.kicc.system.service.IImSessionService; import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -31,7 +29,7 @@ import java.util.Optional; * @author wangxiang4 * @since 2023-12-12 */ -@Controller +@RestController @RequiredArgsConstructor @RequestMapping(AppConstants.APP_SYSTEM + "/imSession") public class ImSessionController { @@ -57,14 +55,14 @@ public class ImSessionController { } @PostMapping("/save") - public R save(@Validated @RequestBody ImSession imSession) { + public R save(@RequestBody ImSession imSession) { iImSessionService.save(imSession); return R.ok(); } @Inner(false) @PostMapping("/sessionSave") - public R sessionSave(@Validated @RequestBody ImSession imSession) { + public R sessionSave(@RequestBody ImSession imSession) { SecurityUtils.openInterfaceTemporaryLoginSession(imSession.getUserId()); imSession.setReceiveTime(LocalDateTime.now()); iImSessionService.save(imSession); diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenCodeParamController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenCodeParamController.java index fa6299e1..122c42ed 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenCodeParamController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GenCodeParamController.java @@ -1,9 +1,17 @@ package com.cloud.kicc.system.devtools.controller; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.system.api.devtools.entity.GenCodeParam; +import com.cloud.kicc.system.devtools.service.IGenCodeParamService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; +import java.util.Arrays; /** *

@@ -13,9 +21,47 @@ import org.springframework.stereotype.Controller; * @author wangxiang4 * @since 2023-12-09 */ -@Controller -@RequestMapping("/genCodeParam") +@RestController +@RequestMapping(AppConstants.APP_SYSTEM + "/gencode/genCodeParam") +@RequiredArgsConstructor public class GenCodeParamController { + private final IGenCodeParamService iGenCodeParamService; + + private LambdaQueryWrapper getQueryWrapper(GenCodeParam genCodeParam) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(genCodeParam.getAuthor()), GenCodeParam::getAuthor, genCodeParam.getAuthor()) + .orderByAsc(GenCodeParam::getId); + } + + @GetMapping("/list") + public R list(Page page, GenCodeParam genCodeParam) { + IPage result = iGenCodeParamService.page(page, getQueryWrapper(genCodeParam)); + return R.ok(result.getRecords(), result.getTotal()); + } + + @GetMapping("/{id:\\w+}") + public R getById(@PathVariable("id") String id) { + return R.ok(iGenCodeParamService.getById(id)); + } + + @PostMapping("/save") + public R save(@RequestBody GenCodeParam genCodeParam) { + iGenCodeParamService.save(genCodeParam); + return R.ok(); + } + + @PutMapping("/update") + public R update(@RequestBody GenCodeParam genCodeParam) { + iGenCodeParamService.updateById(genCodeParam); + return R.ok(); + } + + @DeleteMapping("/remove/{id:[\\w,]+}") + public R remove(@PathVariable String[] id) { + iGenCodeParamService.removeByIds(Arrays.asList(id)); + return R.ok(); + } + } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateGroupController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateGroupController.java index 9a30fb6c..c694ef05 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateGroupController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateGroupController.java @@ -1,9 +1,20 @@ package com.cloud.kicc.system.devtools.controller; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.system.api.devtools.entity.GencodeTemplateGroup; +import com.cloud.kicc.system.api.devtools.entity.GencodeTemplateObj; +import com.cloud.kicc.system.devtools.service.IGencodeTemplateGroupService; +import com.cloud.kicc.system.devtools.service.IGencodeTemplateObjService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; +import java.util.Arrays; /** *

@@ -13,9 +24,49 @@ import org.springframework.stereotype.Controller; * @author wangxiang4 * @since 2023-12-09 */ -@Controller -@RequestMapping("/gencodeTemplateGroup") +@RestController +@RequestMapping(AppConstants.APP_SYSTEM + "/gencode/genCodeTemplateGroup") +@RequiredArgsConstructor public class GencodeTemplateGroupController { + private final IGencodeTemplateGroupService iGencodeTemplateGroupService; + private final IGencodeTemplateObjService iGencodeTemplateObjService; + + private LambdaQueryWrapper getQueryWrapper(GencodeTemplateGroup gencodeTemplateGroup) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(gencodeTemplateGroup.getName()), GencodeTemplateGroup::getName, gencodeTemplateGroup.getName()); + } + + @GetMapping("/list") + public R list(Page page, GencodeTemplateGroup gencodeTemplateGroup) { + IPage result = iGencodeTemplateGroupService.page(page, getQueryWrapper(gencodeTemplateGroup)); + return R.ok(result.getRecords(), result.getTotal()); + } + + @GetMapping("/{id:\\w+}") + public R getById(@PathVariable("id") String id) { + GencodeTemplateGroup gencodeTemplateGroup = iGencodeTemplateGroupService.getById(id); + gencodeTemplateGroup.setGenCodeTemplateObjList(iGencodeTemplateObjService.list(Wrappers.lambdaQuery().eq(GencodeTemplateObj::getGroupId, gencodeTemplateGroup.getId()))); + return R.ok(iGencodeTemplateGroupService.getById(id)); + } + + @PostMapping("/save") + public R save(@RequestBody GencodeTemplateGroup gencodeTemplateGroup) { + iGencodeTemplateGroupService.save(gencodeTemplateGroup); + return R.ok(); + } + + @PutMapping("/update") + public R update(@RequestBody GencodeTemplateGroup gencodeTemplateGroup) { + iGencodeTemplateGroupService.updateById(gencodeTemplateGroup); + return R.ok(); + } + + @DeleteMapping("/remove/{id:[\\w,]+}") + public R remove(@PathVariable String[] id) { + iGencodeTemplateGroupService.removeByIds(Arrays.asList(id)); + return R.ok(); + } + } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/mapper/GenCodeParamMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/mapper/GenCodeParamMapper.java index 50e344d0..89a61b78 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/mapper/GenCodeParamMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/mapper/GenCodeParamMapper.java @@ -2,6 +2,8 @@ package com.cloud.kicc.system.devtools.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cloud.kicc.system.api.devtools.entity.GenCodeParam; +import org.apache.ibatis.annotations.Param; +import org.apache.poi.ss.formula.functions.T; /** *

@@ -13,4 +15,6 @@ import com.cloud.kicc.system.api.devtools.entity.GenCodeParam; */ public interface GenCodeParamMapper extends BaseMapper { + GenCodeParam findUniqueByProperty(@Param("propertyName") String propertyName, @Param("value") Object value); + } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGencodeTemplateGroupService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGencodeTemplateGroupService.java index 0ba8846f..1664b761 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGencodeTemplateGroupService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGencodeTemplateGroupService.java @@ -13,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IGencodeTemplateGroupService extends IService { + void savTemplateGroup(GencodeTemplateGroup gencodeTemplateGroup); + } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GencodeTemplateGroupServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GencodeTemplateGroupServiceImpl.java index c21d8ee5..f6e9b359 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GencodeTemplateGroupServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GencodeTemplateGroupServiceImpl.java @@ -17,4 +17,9 @@ import org.springframework.stereotype.Service; @Service public class GencodeTemplateGroupServiceImpl extends ServiceImpl implements IGencodeTemplateGroupService { + @Override + public void savTemplateGroup(GencodeTemplateGroup gencodeTemplateGroup) { + super.save(gencodeTemplateGroup); + } + } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenCodeParamMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenCodeParamMapper.xml index ef5ba446..41e1ccd2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenCodeParamMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/devtools/GenCodeParamMapper.xml @@ -2,4 +2,10 @@ + + + +