From 2aae30d1eab9b1d129585ef529f2e9dacd64d0fa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 28 二月 2025 10:54:55 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java | 44 ++++
business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java | 51 +++++
business/src/main/resources/mapper/HiddenAdminMapper.xml | 65 ++++++
business/src/main/java/com/ycl/service/HiddenAdminService.java | 69 ++++++
business/src/main/java/com/ycl/controller/HiddenAdminController.java | 98 +++++++++
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 3
business/src/main/java/com/ycl/domain/form/HiddenAdminForm.java | 54 +++++
business/src/main/java/com/ycl/domain/query/HiddenAdminQuery.java | 22 ++
business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java | 141 ++++++++++++++
business/src/main/java/com/ycl/mapper/HiddenAdminMapper.java | 35 +++
10 files changed, 581 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/HiddenAdminController.java b/business/src/main/java/com/ycl/controller/HiddenAdminController.java
new file mode 100644
index 0000000..eab2ef2
--- /dev/null
+++ b/business/src/main/java/com/ycl/controller/HiddenAdminController.java
@@ -0,0 +1,98 @@
+package com.ycl.controller;
+
+import com.ycl.common.group.Update;
+import com.ycl.common.group.Add;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ycl.service.HiddenAdminService;
+import com.ycl.common.base.Result;
+import com.ycl.domain.form.HiddenAdminForm;
+import com.ycl.domain.query.HiddenAdminQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 鍓嶇鎺у埗鍣�
+ *
+ * @author zxl
+ * @since 2025-02-25
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "", tags = "绠＄悊")
+@RestController
+@RequestMapping("/hidden-admin")
+public class HiddenAdminController {
+
+ private final HiddenAdminService hiddenAdminService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ @PreAuthorize("@ss.hasPermi('hiddenAdmin:add')")
+ public Result add(@RequestBody @Validated(Add.class) HiddenAdminForm form) {
+ return hiddenAdminService.add(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ @PreAuthorize("@ss.hasPermi('hiddenAdmin:edit')")
+ public Result update(@RequestBody @Validated(Update.class) HiddenAdminForm form) {
+ return hiddenAdminService.update(form);
+ }
+ @PutMapping("/updateList")
+ @ApiOperation(value = "鎵归噺淇敼", notes = "鎵归噺淇敼")
+ @PreAuthorize("@ss.hasPermi('hiddenAdmin:edit')")
+ public Result updateList(@RequestBody List<HiddenAdminForm> forms){
+ System.out.println(forms + "==============");
+ return hiddenAdminService.updateList(forms);
+ }
+
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ @PreAuthorize("@ss.hasPermi('hiddenAdmin:del')")
+ public Result removeById(@PathVariable("id") String id) {
+ return hiddenAdminService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ @PreAuthorize("@ss.hasPermi('hiddenAdmin:del:batch')")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return hiddenAdminService.remove(ids);
+ }
+
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ @PreAuthorize("@ss.hasPermi('hiddenAdmin:page')")
+ public Result page(HiddenAdminQuery query) {
+ return hiddenAdminService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ @PreAuthorize("@ss.hasPermi('hiddenAdmin:detail')")
+ public Result detail(@PathVariable("id") Integer id) {
+ return hiddenAdminService.detail(id);
+ }
+
+ @GetMapping("/list")
+ @PreAuthorize("@ss.hasPermi('hiddenAdmin:list')")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result list() {
+ return hiddenAdminService.all();
+ }
+
+ @PostMapping("/addList")
+ @PreAuthorize("@ss.hasPermi('hiddenAdmin:add')")
+ public Result saveList(@RequestBody List<HiddenAdminForm> forms) {
+ return hiddenAdminService.addList(forms);
+ }
+
+}
diff --git a/business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java b/business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java
new file mode 100644
index 0000000..fbc60ce
--- /dev/null
+++ b/business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java
@@ -0,0 +1,44 @@
+package com.ycl.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+import com.ycl.system.domain.base.AbsEntity;
+import lombok.Data;
+
+/**
+ *
+ *
+ * @author zxl
+ * @since 2025-02-27
+ */
+@Data
+@TableName("t_hidden_admin")
+public class HiddenAdmin extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableField("name")
+ /** 椤圭洰鍚嶇О */
+ private String name;
+
+ @TableField("display")
+ /** 涓氫富鍗曚綅 */
+ private String display;
+
+ @TableField("sort")
+ /** */
+ private String sort;
+
+ @TableField("columns")
+ /** */
+ private String columns;
+
+ @TableField("slotName")
+ /** */
+ private String slotName;
+
+
+}
diff --git a/business/src/main/java/com/ycl/domain/form/HiddenAdminForm.java b/business/src/main/java/com/ycl/domain/form/HiddenAdminForm.java
new file mode 100644
index 0000000..ead384e
--- /dev/null
+++ b/business/src/main/java/com/ycl/domain/form/HiddenAdminForm.java
@@ -0,0 +1,54 @@
+package com.ycl.domain.form;
+
+import com.ycl.common.group.Update;
+import com.ycl.common.group.Add;
+import com.ycl.system.domain.base.AbsForm;
+import com.ycl.domain.entity.HiddenAdmin;
+import org.springframework.beans.BeanUtils;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 琛ㄥ崟
+ *
+ * @author zxl
+ * @since 2025-02-27
+ */
+@Data
+@ApiModel(value = "HiddenAdmin琛ㄥ崟", description = "琛ㄥ崟")
+public class HiddenAdminForm extends AbsForm {
+
+ @NotBlank(message = "椤圭洰鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("椤圭洰鍚嶇О")
+ private String name;
+
+ @NotBlank(message = "涓氫富鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("涓氫富鍗曚綅")
+ private String display;
+
+ @NotBlank(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("")
+ private String sort;
+
+ @NotBlank(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("")
+ private String columns;
+
+ @NotBlank(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("")
+ private String slotName;
+
+ public static HiddenAdmin getEntityByForm(@NonNull HiddenAdminForm form, HiddenAdmin entity) {
+ if(entity == null) {
+ entity = new HiddenAdmin();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/business/src/main/java/com/ycl/domain/query/HiddenAdminQuery.java b/business/src/main/java/com/ycl/domain/query/HiddenAdminQuery.java
new file mode 100644
index 0000000..54bbde5
--- /dev/null
+++ b/business/src/main/java/com/ycl/domain/query/HiddenAdminQuery.java
@@ -0,0 +1,22 @@
+package com.ycl.domain.query;
+
+import com.ycl.system.domain.base.AbsQuery;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鏌ヨ
+ *
+ * @author zxl
+ * @since 2025-02-27
+ */
+@Data
+@ApiModel(value = "HiddenAdmin鏌ヨ鍙傛暟", description = "鏌ヨ鍙傛暟")
+public class HiddenAdminQuery extends AbsQuery {
+}
+
diff --git a/business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java b/business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java
new file mode 100644
index 0000000..c0d0c21
--- /dev/null
+++ b/business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java
@@ -0,0 +1,51 @@
+package com.ycl.domain.vo;
+
+import com.ycl.system.domain.base.AbsVo;
+import com.ycl.domain.entity.HiddenAdmin;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 灞曠ず
+ *
+ * @author zxl
+ * @since 2025-02-27
+ */
+@Data
+@ApiModel(value = "鍝嶅簲鏁版嵁", description = "鍝嶅簲鏁版嵁")
+public class HiddenAdminVO extends AbsVo {
+
+ /** 椤圭洰鍚嶇О */
+ @ApiModelProperty("椤圭洰鍚嶇О")
+ private String name;
+
+ /** 涓氫富鍗曚綅 */
+ @ApiModelProperty("涓氫富鍗曚綅")
+ private String display;
+
+ /** */
+ @ApiModelProperty("")
+ private String sort;
+
+ /** */
+ @ApiModelProperty("")
+ private String columns;
+
+ /** */
+ @ApiModelProperty("")
+ private String slotName;
+
+ public static HiddenAdminVO getVoByEntity(@NonNull HiddenAdmin entity, HiddenAdminVO vo) {
+ if(vo == null) {
+ vo = new HiddenAdminVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/business/src/main/java/com/ycl/mapper/HiddenAdminMapper.java b/business/src/main/java/com/ycl/mapper/HiddenAdminMapper.java
new file mode 100644
index 0000000..30d5de1
--- /dev/null
+++ b/business/src/main/java/com/ycl/mapper/HiddenAdminMapper.java
@@ -0,0 +1,35 @@
+package com.ycl.mapper;
+
+import com.ycl.domain.entity.HiddenAdmin;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.domain.vo.HiddenAdminVO;
+import com.ycl.domain.form.HiddenAdminForm;
+import com.ycl.domain.query.HiddenAdminQuery;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * Mapper 鎺ュ彛
+ *
+ * @author zxl
+ * @since 2025-02-25
+ */
+@Mapper
+public interface HiddenAdminMapper extends BaseMapper<HiddenAdmin> {
+
+ /**
+ * id鏌ユ壘
+ * @param id
+ * @return
+ */
+ HiddenAdminVO getById(Integer id);
+
+ /**
+ * 鍒嗛〉
+ */
+ IPage getPage(IPage page, @Param("query") HiddenAdminQuery query);
+
+ void updateList(List<HiddenAdminForm> forms);
+}
diff --git a/business/src/main/java/com/ycl/service/HiddenAdminService.java b/business/src/main/java/com/ycl/service/HiddenAdminService.java
new file mode 100644
index 0000000..acbe400
--- /dev/null
+++ b/business/src/main/java/com/ycl/service/HiddenAdminService.java
@@ -0,0 +1,69 @@
+package com.ycl.service;
+
+import com.ycl.domain.entity.HiddenAdmin;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.common.base.Result;
+import com.ycl.domain.form.HiddenAdminForm;
+import com.ycl.domain.query.HiddenAdminQuery;
+import java.util.List;
+
+/**
+ * 鏈嶅姟绫�
+ *
+ * @author zxl
+ * @since 2025-02-25
+ */
+public interface HiddenAdminService extends IService<HiddenAdmin> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(HiddenAdminForm form);
+
+ Result addList(List<HiddenAdminForm> forms);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(HiddenAdminForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(HiddenAdminQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(Integer id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+
+ Result updateList(List<HiddenAdminForm> forms);
+}
diff --git a/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java b/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java
new file mode 100644
index 0000000..356b1d0
--- /dev/null
+++ b/business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java
@@ -0,0 +1,141 @@
+package com.ycl.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.domain.entity.HiddenAdmin;
+import com.ycl.mapper.HiddenAdminMapper;
+import com.ycl.service.HiddenAdminService;
+import com.ycl.common.base.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.domain.form.HiddenAdminForm;
+import com.ycl.domain.vo.HiddenAdminVO;
+import com.ycl.domain.query.HiddenAdminQuery;
+import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+import com.ycl.framework.utils.PageUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.Assert;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 鏈嶅姟瀹炵幇绫�
+ *
+ * @author zxl
+ * @since 2025-02-25
+ */
+@Service
+@RequiredArgsConstructor
+public class HiddenAdminServiceImpl extends ServiceImpl<HiddenAdminMapper, HiddenAdmin> implements HiddenAdminService {
+
+ private final HiddenAdminMapper hiddenAdminMapper;
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(HiddenAdminForm form) {
+ HiddenAdmin entity = HiddenAdminForm.getEntityByForm(form, null);
+ baseMapper.insert(entity);
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+
+ @Override
+ public Result addList(List<HiddenAdminForm> forms){
+ System.out.println(forms + "鎵撳嵃");
+ List<HiddenAdmin> list = new ArrayList<>();
+ for (HiddenAdminForm obj : forms){
+ list.add(HiddenAdminForm.getEntityByForm(obj,null));
+ }
+
+ this.saveBatch(list);
+
+
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(HiddenAdminForm form) {
+ HiddenAdmin entity = baseMapper.selectById(form.getId());
+
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ baseMapper.updateById(entity);
+ return Result.ok("淇敼鎴愬姛");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ baseMapper.deleteBatchIds(ids);
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ baseMapper.deleteById(id);
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(HiddenAdminQuery query) {
+ IPage<HiddenAdminVO> page = PageUtil.getPage(query, HiddenAdminVO.class);
+ baseMapper.getPage(page, query);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(Integer id) {
+ HiddenAdminVO vo = baseMapper.getById(id);
+ Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<HiddenAdmin> entities = baseMapper.selectList(null);
+ List<HiddenAdminVO> vos = entities.stream()
+ .map(entity -> HiddenAdminVO.getVoByEntity(entity, null))
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+
+ @Override
+ public Result updateList(List<HiddenAdminForm> forms) {
+ baseMapper.updateList(forms);
+// this.saveBatch(forms);
+ return Result.ok("淇敼鎴愬姛");
+ }
+}
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 0e0dd79..42058b6 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -7,6 +7,7 @@
import cn.hutool.core.util.ZipUtil;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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.core.toolkit.Wrappers;
@@ -153,7 +154,7 @@
* @return
*/
public boolean checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){
- QueryWrapper<ProjectInfo> queryWrapper = new QueryWrapper<ProjectInfo>();
+ LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>();
if (updateId == null) {
List<ProjectInfo> list = new LambdaQueryChainWrapper<>(baseMapper)
.eq(ProjectInfo::getProjectName, entity.getProjectName())
diff --git a/business/src/main/resources/mapper/HiddenAdminMapper.xml b/business/src/main/resources/mapper/HiddenAdminMapper.xml
new file mode 100644
index 0000000..0dfd432
--- /dev/null
+++ b/business/src/main/resources/mapper/HiddenAdminMapper.xml
@@ -0,0 +1,65 @@
+<?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.ycl.mapper.HiddenAdminMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.domain.vo.HiddenAdminVO">
+ <result column="name" property="name" />
+ <result column="display" property="display" />
+ <result column="sort" property="sort" />
+ <result column="columns" property="columns" />
+ <result column="slotName" property="slotName" />
+ </resultMap>
+
+
+
+
+
+
+
+
+ <select id="getById" resultMap="BaseResultMap">
+ SELECT
+ THA.name,
+ THA.display,
+ THA.sort,
+ THA.colunms,
+ THA.slotName,
+ THA.id
+ FROM
+ t_hidden_admin THA
+ WHERE
+ THA.id = #{id} AND THA.deleted = 0
+ </select>
+
+
+ <select id="getPage" resultMap="BaseResultMap">
+ SELECT
+ THA.name,
+ THA.display,
+ THA.sort,
+ THA.columns,
+ THA.slotName,
+ THA.id
+ FROM
+ t_hidden_admin THA
+ WHERE
+ THA.deleted = 0
+ </select>
+ <update id="updateList">
+ <foreach collection="list" item="item" index="index" separator=";">
+ UPDATE t_hidden_admin THA
+ <set>
+ <if test="item.display != null">
+ THA.display = #{item.display},
+ </if>
+ <if test="item.sort != null" >
+ THA.sort = #{item.sort},
+ </if>
+
+ </set>
+ where THA.id = #{item.id}
+ </foreach>
+
+ </update>
+</mapper>
--
Gitblit v1.8.0