Commit 2289b252 by 吴迪

【修改】投资计划、字典表相关代码

parent 93a808ef
package com.wangtian.modules.manage.controller;
import java.util.Arrays;
import java.util.Map;
import com.wangtian.common.utils.PageUtils;
import com.wangtian.common.utils.R;
import com.wangtian.modules.manage.entity.InvestmentPlanEntity;
import com.wangtian.modules.manage.service.InvestmentPlanService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.wangtian.modules.manage.entity.InvestmentPlanEntity;
import com.wangtian.modules.manage.service.InvestmentPlanService;
import com.wangtian.common.utils.PageUtils;
import com.wangtian.common.utils.R;
import java.util.Arrays;
import java.util.Map;
......@@ -23,7 +18,7 @@ import com.wangtian.common.utils.R;
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-15 15:20:15
* @date 2023-07-16 08:23:26
*/
@RestController
@RequestMapping("manage/investmentplan")
......@@ -35,7 +30,7 @@ public class InvestmentPlanController {
* 列表
*/
@RequestMapping("/list")
@RequiresPermissions("manage:investmentplan:list")
// @RequiresPermissions("manage:investmentplan:list")
public R list(@RequestParam Map<String, Object> params){
PageUtils page = investmentPlanService.queryPage(params);
......@@ -58,7 +53,7 @@ public class InvestmentPlanController {
* 保存
*/
@RequestMapping("/save")
@RequiresPermissions("manage:investmentplan:save")
// @RequiresPermissions("manage:investmentplan:save")
public R save(@RequestBody InvestmentPlanEntity investmentPlan){
investmentPlanService.save(investmentPlan);
......@@ -69,7 +64,7 @@ public class InvestmentPlanController {
* 修改
*/
@RequestMapping("/update")
@RequiresPermissions("manage:investmentplan:update")
// @RequiresPermissions("manage:investmentplan:update")
public R update(@RequestBody InvestmentPlanEntity investmentPlan){
investmentPlanService.updateById(investmentPlan);
......@@ -80,7 +75,7 @@ public class InvestmentPlanController {
* 删除
*/
@RequestMapping("/delete")
@RequiresPermissions("manage:investmentplan:delete")
// @RequiresPermissions("manage:investmentplan:delete")
public R delete(@RequestBody Long[] ids){
investmentPlanService.removeByIds(Arrays.asList(ids));
......
package com.wangtian.modules.manage.controller;
import com.wangtian.common.utils.PageUtils;
import com.wangtian.common.utils.R;
import com.wangtian.modules.manage.entity.SysDictEntity;
import com.wangtian.modules.manage.service.SysDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
/**
* 数据字典表
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-16 08:23:26
*/
@RestController
@RequestMapping("manage/sysdict")
public class SysDictController {
@Autowired
private SysDictService sysDictService;
/**
* 列表
*/
@RequestMapping("/list")
//@RequiresPermissions("manage:sysdict:list")
public R list(@RequestParam Map<String, Object> params){
PageUtils page = sysDictService.queryPage(params);
return R.ok().put("page", page);
}
/**
* 信息
*/
@RequestMapping("/info/{id}")
//@RequiresPermissions("manage:sysdict:info")
public R info(@PathVariable("id") Long id){
SysDictEntity sysDict = sysDictService.getById(id);
return R.ok().put("sysDict", sysDict);
}
/**
* 保存
*/
@RequestMapping("/save")
// @RequiresPermissions("manage:sysdict:save")
public R save(@RequestBody SysDictEntity sysDict){
sysDictService.save(sysDict);
return R.ok();
}
/**
* 修改
*/
@RequestMapping("/update")
//@RequiresPermissions("manage:sysdict:update")
public R update(@RequestBody SysDictEntity sysDict){
sysDictService.updateById(sysDict);
return R.ok();
}
/**
* 删除
*/
@RequestMapping("/delete")
//@RequiresPermissions("manage:sysdict:delete")
public R delete(@RequestBody Long[] ids){
sysDictService.removeByIds(Arrays.asList(ids));
return R.ok();
}
}
package com.wangtian.modules.manage.controller;
import com.wangtian.common.utils.PageUtils;
import com.wangtian.common.utils.R;
import com.wangtian.modules.manage.entity.SysDictItemEntity;
import com.wangtian.modules.manage.service.SysDictItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.Map;
/**
* 数据字段条目表
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-16 08:23:26
*/
@RestController
@RequestMapping("manage/sysdictitem")
public class SysDictItemController {
@Autowired
private SysDictItemService sysDictItemService;
/**
* 列表
*/
@RequestMapping("/list")
//@RequiresPermissions("manage:sysdictitem:list")
public R list(@RequestParam Map<String, Object> params){
PageUtils page = sysDictItemService.queryPage(params);
return R.ok().put("page", page);
}
/**
* 信息
*/
@RequestMapping("/info/{id}")
//@RequiresPermissions("manage:sysdictitem:info")
public R info(@PathVariable("id") Long id){
SysDictItemEntity sysDictItem = sysDictItemService.getById(id);
return R.ok().put("sysDictItem", sysDictItem);
}
/**
* 保存
*/
@RequestMapping("/save")
//@RequiresPermissions("manage:sysdictitem:save")
public R save(@RequestBody SysDictItemEntity sysDictItem){
sysDictItemService.save(sysDictItem);
return R.ok();
}
/**
* 修改
*/
@RequestMapping("/update")
// @RequiresPermissions("manage:sysdictitem:update")
public R update(@RequestBody SysDictItemEntity sysDictItem){
sysDictItemService.updateById(sysDictItem);
return R.ok();
}
/**
* 删除
*/
@RequestMapping("/delete")
// @RequiresPermissions("manage:sysdictitem:delete")
public R delete(@RequestBody Long[] ids){
sysDictItemService.removeByIds(Arrays.asList(ids));
return R.ok();
}
}
......@@ -6,12 +6,12 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 投资计划管理表
*
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-15 15:20:15
* @date 2023-07-16 08:23:26
*/
@Mapper
public interface InvestmentPlanDao extends BaseMapper<InvestmentPlanEntity> {
}
package com.wangtian.modules.manage.dao;
import com.wangtian.modules.manage.entity.SysDictEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* 数据字典表
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-16 08:23:26
*/
@Mapper
public interface SysDictDao extends BaseMapper<SysDictEntity> {
}
package com.wangtian.modules.manage.dao;
import com.wangtian.modules.manage.entity.SysDictItemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* 数据字段条目表
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-16 08:23:26
*/
@Mapper
public interface SysDictItemDao extends BaseMapper<SysDictItemEntity> {
}
package com.wangtian.modules.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
/**
* 投资计划管理表
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-15 15:20:15
* @date 2023-07-16 08:23:26
*/
@Data
@TableName("pm_investment_plan")
......@@ -24,7 +24,7 @@ public class InvestmentPlanEntity implements Serializable {
/**
* 主键,通过idwork-starter生成
*/
@TableId(type = IdType.INPUT)
@TableId
private Long id;
/**
* 投资计划名称
......@@ -72,6 +72,22 @@ public class InvestmentPlanEntity implements Serializable {
*/
private Integer isPublish;
/**
* 创建人id
*/
private Long createUserId;
/**
* 创建人姓名
*/
private String createUserName;
/**
* 修改人id
*/
private Long updateUserId;
/**
* 修改人名称
*/
private String updateUserName;
/**
* 修改时间
*/
private Date updateTime;
......@@ -79,5 +95,11 @@ public class InvestmentPlanEntity implements Serializable {
* 创建时间
*/
private Date createTime;
/**
* 是否删除 0/未删除,1/删除
*/
@TableLogic
private Integer isDelete;
}
package com.wangtian.modules.manage.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 数据字典表
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-16 08:23:26
*/
@Data
@TableName("sys_dict")
public class SysDictEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键,idwork-starter生成
*/
@TableId
private Long id;
/**
* 字典名称
*/
private String dictName;
/**
* 字典编码
*/
private String dictCode;
/**
* 描述
*/
private String description;
/**
* 排序字段
*/
private Integer orderNum;
/**
* 是否发布 0/未发布,1/发布
*/
private Integer isPublish;
/**
* 创建人id
*/
private Long createUserId;
/**
* 创建人姓名
*/
private String createUserName;
/**
* 修改人id
*/
private Long updateUserId;
/**
* 修改人名称
*/
private String updateUserName;
/**
* 修改时间
*/
private Date updateTime;
/**
* 创建时间
*/
private Date createTime;
/**
* 是否删除 0/未删除,1/删除
*/
private Integer isDelete;
}
package com.wangtian.modules.manage.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 数据字段条目表
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-16 08:23:26
*/
@Data
@TableName("sys_dict_item")
public class SysDictItemEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId
private Long id;
/**
* 字典id
*/
private Long dictId;
/**
* 字典项文本
*/
private String itemText;
/**
* 字典项值
*/
private String itemValue;
/**
* 描述
*/
private String description;
/**
* 排序字段
*/
private Integer orderNum;
/**
* 是否发布 0/未发布,1/发布
*/
private Integer isPublish;
/**
* 创建人id
*/
private Long createUserId;
/**
* 创建人姓名
*/
private String createUserName;
/**
* 修改人id
*/
private Long updateUserId;
/**
* 修改人名称
*/
private String updateUserName;
/**
* 修改时间
*/
private Date updateTime;
/**
* 创建时间
*/
private Date createTime;
/**
* 是否删除 0/未删除,1/删除
*/
private Integer isDelete;
}
......@@ -11,7 +11,7 @@ import java.util.Map;
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-15 15:20:15
* @date 2023-07-16 08:23:26
*/
public interface InvestmentPlanService extends IService<InvestmentPlanEntity> {
......
package com.wangtian.modules.manage.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.wangtian.common.utils.PageUtils;
import com.wangtian.modules.manage.entity.SysDictItemEntity;
import java.util.Map;
/**
* 数据字段条目表
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-16 08:23:26
*/
public interface SysDictItemService extends IService<SysDictItemEntity> {
PageUtils queryPage(Map<String, Object> params);
}
package com.wangtian.modules.manage.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.wangtian.common.utils.PageUtils;
import com.wangtian.modules.manage.entity.SysDictEntity;
import java.util.Map;
/**
* 数据字典表
*
* @author wudi
* @email 632132852@qq.com
* @date 2023-07-16 08:23:26
*/
public interface SysDictService extends IService<SysDictEntity> {
PageUtils queryPage(Map<String, Object> params);
}
package com.wangtian.modules.manage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wangtian.common.utils.PageUtils;
import com.wangtian.common.utils.Query;
import com.wangtian.modules.manage.dao.SysDictItemDao;
import com.wangtian.modules.manage.entity.SysDictItemEntity;
import com.wangtian.modules.manage.service.SysDictItemService;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service("sysDictItemService")
public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemDao, SysDictItemEntity> implements SysDictItemService {
@Override
public PageUtils queryPage(Map<String, Object> params) {
IPage<SysDictItemEntity> page = this.page(
new Query<SysDictItemEntity>().getPage(params),
new QueryWrapper<SysDictItemEntity>()
);
return new PageUtils(page);
}
}
package com.wangtian.modules.manage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wangtian.common.utils.PageUtils;
import com.wangtian.common.utils.Query;
import com.wangtian.modules.manage.dao.SysDictDao;
import com.wangtian.modules.manage.entity.SysDictEntity;
import com.wangtian.modules.manage.service.SysDictService;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service("sysDictService")
public class SysDictServiceImpl extends ServiceImpl<SysDictDao, SysDictEntity> implements SysDictService {
@Override
public PageUtils queryPage(Map<String, Object> params) {
IPage<SysDictEntity> page = this.page(
new Query<SysDictEntity>().getPage(params),
new QueryWrapper<SysDictEntity>()
);
return new PageUtils(page);
}
}
......@@ -9,6 +9,7 @@
package com.wangtian.modules.sys.controller;
import com.wangtian.common.utils.R;
import com.wangtian.common.validator.ValidatorUtils;
import com.wangtian.modules.sys.entity.SysUserEntity;
import com.wangtian.modules.sys.form.SysLoginForm;
import com.wangtian.modules.sys.service.SysCaptchaService;
......@@ -64,6 +65,8 @@ public class SysLoginController extends AbstractController {
*/
@PostMapping("/sys/login")
public Map<String, Object> login(@RequestBody SysLoginForm form)throws IOException {
//表单校验
ValidatorUtils.validateEntity(form);
boolean captcha = sysCaptchaService.validate(form.getUuid(), form.getCaptcha());
//if(!captcha){
// return R.error("验证码不正确");
......
......@@ -8,8 +8,12 @@
package com.wangtian.modules.sys.form;
import com.wangtian.common.validator.group.AddGroup;
import com.wangtian.common.validator.group.UpdateGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 登录表单
*
......@@ -17,9 +21,14 @@ import lombok.Data;
*/
@Data
public class SysLoginForm {
@NotBlank(message="用户名不能为空")
private String username;
@NotBlank(message="密码不能为空")
private String password;
@NotBlank(message="验证码不能为空")
private String captcha;
@NotBlank(message="uuid不能为空")
private String uuid;
......
......@@ -53,8 +53,10 @@ mybatis-plus:
#数据库相关配置
db-config:
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
id-type: AUTO
logic-delete-value: -1
id-type: INPUT
# 1 代表已删除,不配置默认是1,也可修改配置
logic-delete-value: 1
# 0 代表未删除,不配置默认是0,也可修改配置
logic-not-delete-value: 0
banner: false
#原生配置
......@@ -65,6 +67,8 @@ mybatis-plus:
jdbc-type-for-null: 'null'
renren:
redis:
open: false
......
......@@ -8,14 +8,14 @@
<springProfile name="dev,test">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO" />
<logger name="io.wangtian" level="DEBUG" />
<logger name="com.wangtian" level="DEBUG" />
</springProfile>
<!-- 生产环境 -->
<springProfile name="prod">
<logger name="org.springframework.web" level="ERROR"/>
<logger name="org.springboot.sample" level="ERROR" />
<logger name="io.wangtian" level="ERROR" />
<logger name="com.wangtian" level="ERROR" />
</springProfile>
......
......@@ -17,9 +17,14 @@
<result property="planRemarks" column="plan_remarks"/>
<result property="orderNum" column="order_num"/>
<result property="isPublish" column="is_publish"/>
<result property="createUserId" column="create_user_id"/>
<result property="createUserName" column="create_user_name"/>
<result property="updateUserId" column="update_user_id"/>
<result property="updateUserName" column="update_user_name"/>
<result property="updateTime" column="update_time"/>
<result property="createTime" column="create_time"/>
<result property="isDelete" column="is_delete"/>
</resultMap>
</mapper>
</mapper>
\ No newline at end of file
<?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.wangtian.modules.manage.dao.SysDictDao">
<!-- 可根据自己的需求,是否要使用 -->
<resultMap type="com.wangtian.modules.manage.entity.SysDictEntity" id="sysDictMap">
<result property="id" column="id"/>
<result property="dictName" column="dict_name"/>
<result property="dictCode" column="dict_code"/>
<result property="description" column="description"/>
<result property="orderNum" column="order_num"/>
<result property="isPublish" column="is_publish"/>
<result property="createUserId" column="create_user_id"/>
<result property="createUserName" column="create_user_name"/>
<result property="updateUserId" column="update_user_id"/>
<result property="updateUserName" column="update_user_name"/>
<result property="updateTime" column="update_time"/>
<result property="createTime" column="create_time"/>
<result property="isDelete" column="is_delete"/>
</resultMap>
</mapper>
\ No newline at end of file
<?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.wangtian.modules.manage.dao.SysDictItemDao">
<!-- 可根据自己的需求,是否要使用 -->
<resultMap type="com.wangtian.modules.manage.entity.SysDictItemEntity" id="sysDictItemMap">
<result property="id" column="id"/>
<result property="dictId" column="dict_id"/>
<result property="itemText" column="item_text"/>
<result property="itemValue" column="item_value"/>
<result property="description" column="description"/>
<result property="orderNum" column="order_num"/>
<result property="isPublish" column="is_publish"/>
<result property="createUserId" column="create_user_id"/>
<result property="createUserName" column="create_user_name"/>
<result property="updateUserId" column="update_user_id"/>
<result property="updateUserName" column="update_user_name"/>
<result property="updateTime" column="update_time"/>
<result property="createTime" column="create_time"/>
<result property="isDelete" column="is_delete"/>
</resultMap>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment