2112A-ONE
/
muyu-rule
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增规则类型增删改查

master
面包骑士 2024-08-21 20:46:05 +08:00
parent a1fca52e18
commit 2abfe2e8e6
13 changed files with 494 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
logs/muyu-rule/error.log
View File

@ -1,9 +1,9 @@
14:47:45.426 [com.alibaba.nacos.client.Worker.0] ERROR c.a.n.c.a.i.p.HttpLoginProcessor - [getResponse,85] - login failed: {"code":404,"message":"{\"timestamp\":\"2024-08-21T14:47:47.428+08:00\",\"status\":404,\"error\":\"Not Found\",\"message\":\"No message available\",\"path\":\"/nacos/v1/auth/users/login\"}","header":{"header":{"Accept-Charset":"UTF-8","Connection":"keep-alive","Content-Security-Policy":"script-src 'self'","Content-Type":"application/json","Date":"Wed, 21 Aug 2024 06:47:47 GMT","Keep-Alive":"timeout=60","Transfer-Encoding":"chunked","Vary":"Access-Control-Request-Headers"},"originalResponseHeader":{"Connection":["keep-alive"],"Content-Security-Policy":["script-src 'self'"],"Content-Type":["application/json"],"Date":["Wed, 21 Aug 2024 06:47:47 GMT"],"Keep-Alive":["timeout=60"],"Transfer-Encoding":["chunked"],"Vary":["Access-Control-Request-Headers","Access-Control-Request-Method","Origin"]},"charset":"UTF-8"}}
14:47:47.832 [main] ERROR o.s.b.SpringApplication - [reportFailure,859] - Application run failed
org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'requestMappingHandlerMapping' defined in class path resource [org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration$EnableWebMvcConfiguration.class]: Ambiguous mapping. Cannot map 'ruleController' method
com.muyu.rule.controller.RuleController#insert(Rule)
org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'requestMappingHandlerMapping' defined in class path resource [org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration$EnableWebMvcConfiguration.class]: Ambiguous mapping. Cannot map 'ruleController' method
com.muyu.rule.ruleEngine.controller.RuleController#insert(Rule)
to {GET [/rule/update]}: There is already 'ruleController' bean method
com.muyu.rule.controller.RuleController#update(Rule) mapped.
com.muyu.rule.ruleEngine.controller.RuleController#update(Rule) mapped.
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1788)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:600)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:522)
@ -20,11 +20,11 @@ com.muyu.rule.controller.RuleController#update(Rule) mapped.
at org.springframework.boot.SpringApplication.run(SpringApplication.java:335)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1363)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1352)
at com.muyu.rule.MuYuRuleApplication.main(MuYuRuleApplication.java:22)
Caused by: java.lang.IllegalStateException: Ambiguous mapping. Cannot map 'ruleController' method
com.muyu.rule.controller.RuleController#insert(Rule)
at com.muyu.rule.ruleEngine.MuYuRuleApplication.main(MuYuRuleApplication.java:22)
Caused by: java.lang.IllegalStateException: Ambiguous mapping. Cannot map 'ruleController' method
com.muyu.rule.ruleEngine.controller.RuleController#insert(Rule)
to {GET [/rule/update]}: There is already 'ruleController' bean method
com.muyu.rule.controller.RuleController#update(Rule) mapped.
com.muyu.rule.ruleEngine.controller.RuleController#update(Rule) mapped.
at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping$MappingRegistry.validateMethodMapping(AbstractHandlerMethodMapping.java:674)
at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping$MappingRegistry.register(AbstractHandlerMethodMapping.java:636)
at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.registerHandlerMethod(AbstractHandlerMethodMapping.java:331)

66
muyu-rule-common/src/main/java/rule/domain/RuleType.java 100644
View File

@ -0,0 +1,66 @@
package rule.domain;
import com.muyu.common.core.validation.custom.IsSysYesNo;
import lombok.*;
import lombok.experimental.SuperBuilder;
import com.muyu.common.core.annotation.Excel;
import com.muyu.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 规则分类对象 rule_type
*
* @author muyu
* @date 2024-08-21
*/
@Data
@Setter
@Getter
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class RuleType extends BaseEntity {
/** 自增主键 */
private Long id;
/** 规则分类编码 */
@Excel(name = "规则分类编码")
private String ruleTypeCode;
/** 规则分类名称 */
@Excel(name = "规则分类名称")
private String ruleTypeName;
/** 类型描述 */
@Excel(name = "类型描述")
private String ruleTypeDesc;
/** 启用状态 */
@Excel(name = "启用状态")
@IsSysYesNo
private String state;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("ruleTypeCode", getRuleTypeCode())
.append("ruleTypeName", getRuleTypeName())
.append("ruleTypeDesc", getRuleTypeDesc())
.append("state", getState())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

2
muyu-rule-server/src/main/java/com/muyu/rule/MuYuRuleApplication.java → muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/MuYuRuleApplication.java
View File

@ -1,4 +1,4 @@
package com.muyu.rule;
package com.muyu.rule.ruleEngine;
import com.muyu.common.security.annotation.EnableCustomConfig;
import com.muyu.common.security.annotation.EnableMyFeignClients;

4
muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleController.java → muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/controller/RuleController.java
View File

@ -1,7 +1,7 @@
package com.muyu.rule.controller;
package com.muyu.rule.ruleEngine.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.rule.service.RuleService;
import com.muyu.rule.ruleEngine.service.RuleService;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

105
muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/controller/RuleTypeController.java 100644
View File

@ -0,0 +1,105 @@
package com.muyu.rule.ruleEngine.controller;
import java.util.List;
import com.muyu.rule.ruleEngine.service.RuleTypeService;
import jakarta.servlet.http.HttpServletResponse;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;
import rule.domain.RuleType;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.page.TableDataInfo;
/**
* 规则分类Controller
*
* @author muyu
* @date 2024-08-21
*/
@RestController
@RequestMapping("/ruleType")
public class RuleTypeController extends BaseController
{
@Resource
private RuleTypeService ruleTypeService;
/**
* 查询规则分类列表
*/
@RequiresPermissions("rule:ruleType:list")
@GetMapping("/list")
public Result<TableDataInfo<RuleType>> list(RuleType ruleType)
{
startPage();
List<RuleType> list = ruleTypeService.selectRuleTypeList(ruleType);
return getDataTable(list);
}
/**
* 导出规则分类列表
*/
@RequiresPermissions("rule:ruleType:export")
@Log(title = "规则分类", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, RuleType ruleType)
{
List<RuleType> list = ruleTypeService.selectRuleTypeList(ruleType);
ExcelUtil<RuleType> util = new ExcelUtil<RuleType>(RuleType.class);
util.exportExcel(response, list, "规则分类数据");
}
/**
* 获取规则分类详细信息
*/
@RequiresPermissions("rule:ruleType:query")
@GetMapping(value = "/{id}")
public Result<List<RuleType>> getInfo(@PathVariable("id") Long id)
{
return success(ruleTypeService.selectRuleTypeById(id));
}
/**
* 新增规则分类
*/
@RequiresPermissions("rule:ruleType:add")
@Log(title = "规则分类", businessType = BusinessType.INSERT)
@PostMapping
public Result<Integer> add(@RequestBody RuleType ruleType)
{
return toAjax(ruleTypeService.insertRuleType(ruleType));
}
/**
* 修改规则分类
*/
@RequiresPermissions("rule:ruleType:edit")
@Log(title = "规则分类", businessType = BusinessType.UPDATE)
@PutMapping
public Result<Integer> edit(@RequestBody RuleType ruleType)
{
return toAjax(ruleTypeService.updateRuleType(ruleType));
}
/**
* 删除规则分类
*/
@RequiresPermissions("rule:ruleType:remove")
@Log(title = "规则分类", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public Result<Integer> remove(@PathVariable("ids") Long[] ids)
{
return toAjax(ruleTypeService.deleteRuleTypeByIds(ids));
}
}

2
muyu-rule-server/src/main/java/com/muyu/rule/mapper/RuleMapper.java → muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/mapper/RuleMapper.java
View File

@ -1,4 +1,4 @@
package com.muyu.rule.mapper;
package com.muyu.rule.ruleEngine.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

61
muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/mapper/RuleTypeMapper.java 100644
View File

@ -0,0 +1,61 @@
package com.muyu.rule.ruleEngine.mapper;
import java.util.List;
import rule.domain.RuleType;
/**
* 规则分类Mapper接口
*
* @author muyu
* @date 2024-08-21
*/
public interface RuleTypeMapper
{
/**
* 查询规则分类
*
* @param id 规则分类主键
* @return 规则分类
*/
public RuleType selectRuleTypeById(Long id);
/**
* 查询规则分类列表
*
* @param ruleType 规则分类
* @return 规则分类集合
*/
public List<RuleType> selectRuleTypeList(RuleType ruleType);
/**
* 新增规则分类
*
* @param ruleType 规则分类
* @return 结果
*/
public int insertRuleType(RuleType ruleType);
/**
* 修改规则分类
*
* @param ruleType 规则分类
* @return 结果
*/
public int updateRuleType(RuleType ruleType);
/**
* 删除规则分类
*
* @param id 规则分类主键
* @return 结果
*/
public int deleteRuleTypeById(Long id);
/**
* 批量删除规则分类
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteRuleTypeByIds(Long[] ids);
}

2
muyu-rule-server/src/main/java/com/muyu/rule/service/RuleService.java → muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/service/RuleService.java
View File

@ -1,4 +1,4 @@
package com.muyu.rule.service;
package com.muyu.rule.ruleEngine.service;
import com.baomidou.mybatisplus.extension.service.IService;
import rule.domain.Rule;

60
muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/service/RuleTypeService.java 100644
View File

@ -0,0 +1,60 @@
package com.muyu.rule.ruleEngine.service;
import java.util.List;
import rule.domain.RuleType;
/**
* 规则分类Service接口
*
* @author muyu
* @date 2024-08-21
*/
public interface RuleTypeService {
/**
* 查询规则分类
*
* @param id 规则分类主键
* @return 规则分类
*/
public RuleType selectRuleTypeById(Long id);
/**
* 查询规则分类列表
*
* @param ruleType 规则分类
* @return 规则分类集合
*/
public List<RuleType> selectRuleTypeList(RuleType ruleType);
/**
* 新增规则分类
*
* @param ruleType 规则分类
* @return 结果
*/
public int insertRuleType(RuleType ruleType);
/**
* 修改规则分类
*
* @param ruleType 规则分类
* @return 结果
*/
public int updateRuleType(RuleType ruleType);
/**
* 批量删除规则分类
*
* @param ids 需要删除的规则分类主键集合
* @return 结果
*/
public int deleteRuleTypeByIds(Long[] ids);
/**
* 删除规则分类信息
*
* @param id 规则分类主键
* @return 结果
*/
public int deleteRuleTypeById(Long id);
}

6
muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleServiceImpl.java → muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/service/impl/RuleServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.muyu.rule.service.impl;
package com.muyu.rule.ruleEngine.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.rule.mapper.RuleMapper;
import com.muyu.rule.service.RuleService;
import com.muyu.rule.ruleEngine.mapper.RuleMapper;
import com.muyu.rule.ruleEngine.service.RuleService;
import org.springframework.stereotype.Service;
import rule.domain.Rule;

97
muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/service/impl/RuleTypeServiceImpl.java 100644
View File

@ -0,0 +1,97 @@
package com.muyu.rule.ruleEngine.service.impl;
import java.util.List;
import com.muyu.common.core.utils.DateUtils;
import javax.annotation.Resource;
import com.muyu.rule.ruleEngine.mapper.RuleTypeMapper;
import com.muyu.rule.ruleEngine.service.RuleTypeService;
import org.springframework.stereotype.Service;
import rule.domain.RuleType;
/**
* 规则分类Service业务层处理
*
* @author muyu
* @date 2024-08-21
*/
@Service
public class RuleTypeServiceImpl implements RuleTypeService
{
@Resource
private RuleTypeMapper ruleTypeMapper;
/**
* 查询规则分类
*
* @param id 规则分类主键
* @return 规则分类
*/
@Override
public RuleType selectRuleTypeById(Long id)
{
return ruleTypeMapper.selectRuleTypeById(id);
}
/**
* 查询规则分类列表
*
* @param ruleType 规则分类
* @return 规则分类
*/
@Override
public List<RuleType> selectRuleTypeList(RuleType ruleType)
{
return ruleTypeMapper.selectRuleTypeList(ruleType);
}
/**
* 新增规则分类
*
* @param ruleType 规则分类
* @return 结果
*/
@Override
public int insertRuleType(RuleType ruleType)
{
ruleType.setCreateTime(DateUtils.getNowDate());
return ruleTypeMapper.insertRuleType(ruleType);
}
/**
* 修改规则分类
*
* @param ruleType 规则分类
* @return 结果
*/
@Override
public int updateRuleType(RuleType ruleType)
{
ruleType.setUpdateTime(DateUtils.getNowDate());
return ruleTypeMapper.updateRuleType(ruleType);
}
/**
* 批量删除规则分类
*
* @param ids 需要删除的规则分类主键
* @return 结果
*/
@Override
public int deleteRuleTypeByIds(Long[] ids)
{
return ruleTypeMapper.deleteRuleTypeByIds(ids);
}
/**
* 删除规则分类信息
*
* @param id 规则分类主键
* @return 结果
*/
@Override
public int deleteRuleTypeById(Long id)
{
return ruleTypeMapper.deleteRuleTypeById(id);
}
}

2
muyu-rule-server/src/main/java/com/muyu/rule/utils/Desensitization.java → muyu-rule-server/src/main/java/com/muyu/rule/ruleEngine/utils/Desensitization.java
View File

@ -1,4 +1,4 @@
package com.muyu.rule.utils;
package com.muyu.rule.ruleEngine.utils;
import org.apache.commons.lang3.StringUtils;

89
muyu-rule-server/src/main/resources/mapper/rule/RuleTypeMapper.xml 100644
View File

@ -0,0 +1,89 @@
<?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.muyu.rule.ruleEngine.mapper.RuleTypeMapper">
<resultMap type="RuleType" id="RuleTypeResult">
<result property="id" column="id" />
<result property="ruleTypeCode" column="rule_type_code" />
<result property="ruleTypeName" column="rule_type_name" />
<result property="ruleTypeDesc" column="rule_type_desc" />
<result property="state" column="state" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectRuleTypeVo">
select id, rule_type_code, rule_type_name, rule_type_desc, state, create_by, create_time, update_by, update_time, remark from rule_type
</sql>
<select id="selectRuleTypeList" parameterType="RuleType" resultMap="RuleTypeResult">
<include refid="selectRuleTypeVo"/>
<where>
<if test="ruleTypeName != null and ruleTypeName != ''"> and rule_type_name like concat('%', #{ruleTypeName}, '%')</if>
<if test="state != null and state != ''"> and state = #{state}</if>
</where>
</select>
<select id="selectRuleTypeById" parameterType="Long" resultMap="RuleTypeResult">
<include refid="selectRuleTypeVo"/>
where id = #{id}
</select>
<insert id="insertRuleType" parameterType="RuleType" useGeneratedKeys="true" keyProperty="id">
insert into rule_type
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ruleTypeCode != null and ruleTypeCode != ''">rule_type_code,</if>
<if test="ruleTypeName != null">rule_type_name,</if>
<if test="ruleTypeDesc != null">rule_type_desc,</if>
<if test="state != null">state,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ruleTypeCode != null and ruleTypeCode != ''">#{ruleTypeCode},</if>
<if test="ruleTypeName != null">#{ruleTypeName},</if>
<if test="ruleTypeDesc != null">#{ruleTypeDesc},</if>
<if test="state != null">#{state},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateRuleType" parameterType="RuleType">
update rule_type
<trim prefix="SET" suffixOverrides=",">
<if test="ruleTypeCode != null and ruleTypeCode != ''">rule_type_code = #{ruleTypeCode},</if>
<if test="ruleTypeName != null">rule_type_name = #{ruleTypeName},</if>
<if test="ruleTypeDesc != null">rule_type_desc = #{ruleTypeDesc},</if>
<if test="state != null">state = #{state},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteRuleTypeById" parameterType="Long">
delete from rule_type where id = #{id}
</delete>
<delete id="deleteRuleTypeByIds" parameterType="String">
delete from rule_type where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>