فهرست منبع

feat: 参数配置开发

chenjianhua 7 ماه پیش
والد
کامیت
f718c849d6

+ 3 - 3
service-base/src/main/java/com/simuwang/base/mapper/system/SysConfigMapper.java

@@ -30,7 +30,7 @@ public interface SysConfigMapper {
      * @param configId 参数ID
      * @return 参数配置信息
      */
-    public SysConfigDO selectConfigById(Long configId);
+    public SysConfigDO selectConfigById(Integer configId);
 
     /**
      * 查询参数配置列表
@@ -70,7 +70,7 @@ public interface SysConfigMapper {
      * @param configId 参数ID
      * @return 结果
      */
-    public int deleteConfigById(@Param("configId") Long configId);
+    public int deleteConfigById(@Param("configId") Integer configId);
 
     /**
      * 批量删除参数信息
@@ -78,7 +78,7 @@ public interface SysConfigMapper {
      * @param configIds 需要删除的参数ID
      * @return 结果
      */
-    public int deleteConfigByIds(@Param("configIds") Long[] configIds);
+    public int deleteConfigByIds(@Param("configIds") List<Integer> configIds,@Param("userId") Integer userId);
 
 
     String selectConfigByKey(@Param("configKey") String configKey);

+ 18 - 0
service-base/src/main/java/com/simuwang/base/pojo/vo/ConfigIdListVO.java

@@ -0,0 +1,18 @@
+package com.simuwang.base.pojo.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * FileName: ConfigIdListVO
+ * Author:   chenjianhua
+ * Date:     2024/9/26 16:04
+ * Description: ${DESCRIPTION}
+ */
+@Data
+public class ConfigIdListVO {
+
+    private List<Integer> configIdList;
+
+}

+ 18 - 0
service-base/src/main/java/com/simuwang/base/pojo/vo/ConfigIdVO.java

@@ -0,0 +1,18 @@
+package com.simuwang.base.pojo.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * FileName: ConfigIdListVO
+ * Author:   chenjianhua
+ * Date:     2024/9/26 16:04
+ * Description: ${DESCRIPTION}
+ */
+@Data
+public class ConfigIdVO {
+
+    private Integer configId;
+
+}

+ 5 - 3
service-base/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -39,9 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="sqlwhereSearch"/>
     </select>
     
-    <select id="selectConfigList" parameterType="com.simuwang.base.pojo.dos.SysConfigDO" resultMap="SysConfigResult">
+    <select id="selectConfigList" resultMap="SysConfigResult">
         <include refid="selectConfigDo"/>
         <where>
+            isvalid=1
 			<if test="configName != null and configName != ''">
 				AND config_name like concat('%', #{configName}, '%')
 			</if>
@@ -65,7 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
     <select id="countConfigList" resultType="java.lang.Long">
-        select count(1) from
+        select count(1) from PPW_EMAIL.sys_config
+        <include refid="sqlwhereSearch"/>
     </select>
 
     <insert id="insertConfig" parameterType="com.simuwang.base.pojo.dos.SysConfigDO">
@@ -113,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
     
     <delete id="deleteConfigByIds" parameterType="Long">
-        UPDATE sys_config SET isvalid=0 where config_id in
+        UPDATE sys_config SET isvalid=0,updaterid=#{userId} where config_id in
         <foreach item="configId" collection="configIds" open="(" separator="," close=")">
         	#{configId}
         </foreach>

+ 44 - 10
service-manage/src/main/java/com/simuwang/manage/api/system/SysConfigController.java

@@ -1,27 +1,20 @@
 package com.simuwang.manage.api.system;
 
-import com.simuwang.base.common.result.AjaxResult;
 import com.simuwang.base.common.support.MybatisPage;
-import com.simuwang.base.pojo.dos.SysConfigDO;
 import com.simuwang.base.pojo.dto.query.ConfigPageQuery;
-import com.simuwang.base.pojo.dto.sys.MenuQuery;
+import com.simuwang.base.pojo.vo.ConfigIdListVO;
+import com.simuwang.base.pojo.vo.ConfigIdVO;
 import com.simuwang.base.pojo.vo.SysConfigVO;
-import com.simuwang.base.pojo.vo.sys.SysMenuVO;
 import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.system.SysConfigService;
 import com.smppw.common.pojo.ResultVo;
-import com.smppw.common.pojo.enums.status.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 /**
- * 参数配置 信息操作处理
- *
+ * 参数配置
  * @author ruoyi
  */
 @SystemLog(value = "参数配置管理")
@@ -32,10 +25,51 @@ public class SysConfigController
     @Autowired
     private SysConfigService configService;
 
+    /**
+     * 查询参数配置列表
+     * @param query
+     * @return
+     */
     @SystemLog("查询参数配置列表")
     @GetMapping("/search-config-list")
     public MybatisPage<SysConfigVO> searchConfigList(ConfigPageQuery query) {
         return configService.searchConfigList(query);
     }
 
+    /**
+     * 批量删除参数配置
+     * @param configIdListVO
+     * @return
+     */
+    @SystemLog("批量删除参数配置")
+    @PostMapping("/delete-config-list")
+    public boolean deleteConfigList(@RequestBody ConfigIdListVO configIdListVO) {
+        configService.deleteConfigList(configIdListVO.getConfigIdList());
+        return true;
+    }
+
+    /**
+     * 编辑查询
+     * @param configIdVO
+     * @return
+     */
+    @SystemLog("编辑查询")
+    @PostMapping("/search-config")
+    public ResultVo searchConfigList(@RequestBody ConfigIdVO configIdVO) {
+        SysConfigVO sysConfigVO = configService.searchConfigById(configIdVO.getConfigId());
+        return new ResultVo(sysConfigVO==null?false:sysConfigVO);
+    }
+
+    /**
+     * 保存参数配置
+     * @param sysConfigVO
+     * @return
+     */
+    @SystemLog("保存参数配置")
+    @PostMapping("/save-config")
+    public ResultVo saveConfig(@RequestBody SysConfigVO sysConfigVO) {
+        ResultVo vo = configService.saveConfig(sysConfigVO);
+        return vo;
+    }
+
 }

+ 44 - 0
service-manage/src/main/java/com/simuwang/manage/service/impl/system/SysConfigServiceImpl.java

@@ -4,12 +4,16 @@ import com.simuwang.base.common.conts.UserConstants;
 import com.simuwang.base.common.exception.ServiceException;
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.common.text.Convert;
+import com.simuwang.base.common.util.DateUtils;
 import com.simuwang.base.common.util.StringUtil;
 import com.simuwang.base.mapper.system.SysConfigMapper;
 import com.simuwang.base.pojo.dos.SysConfigDO;
 import com.simuwang.base.pojo.dto.query.ConfigPageQuery;
 import com.simuwang.base.pojo.vo.SysConfigVO;
 import com.simuwang.manage.service.system.SysConfigService;
+import com.simuwang.shiro.utils.UserUtils;
+import com.smppw.common.pojo.ResultVo;
+import com.smppw.common.pojo.enums.status.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,4 +51,44 @@ public class SysConfigServiceImpl implements SysConfigService {
         return MybatisPage.of(total,sysConfigVOList);
     }
 
+    @Override
+    public void deleteConfigList(List<Integer> configIdList) {
+        Integer userId = UserUtils.getLoginUser().getUserId();
+        sysConfigMapper.deleteConfigByIds(configIdList,userId);
+    }
+
+    @Override
+    public SysConfigVO searchConfigById(Integer configId) {
+        SysConfigDO SysConfigVO = sysConfigMapper.selectConfigById(configId);
+        return SysConfigVO.toVO();
+    }
+
+    @Override
+    public ResultVo saveConfig(SysConfigVO sysConfigVO) {
+        Integer userId = UserUtils.getLoginUser().getUserId();
+        ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
+        vo.setData(true);
+        if(sysConfigVO.getConfigId() == null && checkConfigKeyUnique(sysConfigVO)){
+            vo.setMsg("已存在相同的参数配置信息,无须重复添加");
+            vo.setData(false);
+            return vo;
+        }
+        SysConfigDO sysConfigDO = new SysConfigDO();
+        sysConfigDO.setConfigId(sysConfigVO.getConfigId());
+        sysConfigDO.setConfigValue(sysConfigVO.getConfigValue());
+        sysConfigDO.setConfigName(sysConfigVO.getConfigName());
+        sysConfigDO.setConfigKey(sysConfigVO.getConfigKey());
+        sysConfigDO.setIsvalid(1);
+        sysConfigDO.setConfigType(sysConfigVO.getConfigType());
+        sysConfigDO.setRemark(sysConfigVO.getRemark());
+        sysConfigDO.setUpdaterId(userId);
+        sysConfigDO.setUpdateTime(DateUtils.getNowDate());
+        if(sysConfigVO.getConfigId() == null){
+            sysConfigDO.setCreatorId(userId);
+            sysConfigDO.setCreateTime(DateUtils.getNowDate());
+        }
+        sysConfigMapper.insertConfig(sysConfigDO);
+        return vo;
+    }
+
 }

+ 7 - 0
service-manage/src/main/java/com/simuwang/manage/service/system/SysConfigService.java

@@ -4,6 +4,7 @@ import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.pojo.dos.SysConfigDO;
 import com.simuwang.base.pojo.dto.query.ConfigPageQuery;
 import com.simuwang.base.pojo.vo.SysConfigVO;
+import com.smppw.common.pojo.ResultVo;
 
 import java.util.List;
 
@@ -18,4 +19,10 @@ public interface SysConfigService {
     boolean checkConfigKeyUnique(SysConfigVO config);
 
     MybatisPage<SysConfigVO> searchConfigList(ConfigPageQuery query);
+
+    void deleteConfigList(List<Integer> configIdList);
+
+    SysConfigVO searchConfigById(Integer configId);
+
+    ResultVo saveConfig(SysConfigVO sysConfigVO);
 }