diff --git a/src/main/java/com/company/business/controller/OptionController.java b/src/main/java/com/company/business/controller/OptionController.java deleted file mode 100644 index 1eba7d6..0000000 --- a/src/main/java/com/company/business/controller/OptionController.java +++ /dev/null @@ -1,41 +0,0 @@ -//package com.company.business.controller; -// -// -//import cn.dev33.satoken.annotation.SaCheckPermission; -//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -//import com.baomidou.mybatisplus.core.toolkit.Wrappers; -//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -//import com.company.business.entity.TbUserOption; -//import com.company.business.service.OptionService; -//import com.company.project.common.aop.annotation.LogAnnotation; -// -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -// -//import org.springframework.web.bind.annotation.*; -// -//import javax.annotation.Resource; -// -///** -// * 用户意见收集查询 -// */ -//@RequestMapping("/option") -//@RestController -//@Api(tags = "意见收集-意见收集") -//public class OptionController { -// @Resource -// private OptionService optionService; -// -// @PostMapping("/listByPage") -// @ApiOperation(value = "分页查询用户意见接口") -// @LogAnnotation(title = "意见收集", action = "分页查询用户意见接口") -// @SaCheckPermission("tb:option:list") -// @SuppressWarnings("unchecked") -// public Page pageInfo(@RequestBody TbUserOption vo) { -// LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); -// queryWrapper.orderByDesc(TbUserOption::getCreateTime); -// return optionService.page(vo.getQueryPage(), queryWrapper); -// } -// -// -//} diff --git a/src/main/java/com/company/project/controller/OptionController.java b/src/main/java/com/company/project/controller/OptionController.java index 6aad5a4..7a76aa6 100644 --- a/src/main/java/com/company/project/controller/OptionController.java +++ b/src/main/java/com/company/project/controller/OptionController.java @@ -1,32 +1,31 @@ package com.company.project.controller; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.company.business.entity.TbUserOption; +import com.company.project.entity.SysRole; +import com.company.project.entity.SysUser; +import com.company.project.entity.TbTask; +import com.company.project.entity.TbUserOption; import com.company.project.common.aop.annotation.LogAnnotation; import com.company.project.common.utils.ExportExcelUtil; import com.company.project.service.OptionService; +import com.company.project.service.UserService; +import com.company.project.vo.resp.UserInfoRespVO; +import com.company.project.vo.resp.UserOwnRoleRespVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.hibernate.validator.internal.util.StringHelper; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -41,6 +40,9 @@ public class OptionController { @Resource private OptionService optionService; + @Resource + private UserService userService; + @PostMapping("/listByPage") @ApiOperation(value = "分页查询用户意见接口") @LogAnnotation(title = "意见收集", action = "分页查询用户意见接口") @@ -85,4 +87,47 @@ public class OptionController { public void addOption(@RequestBody TbUserOption vo) { optionService.addOption(vo); } + + @PostMapping("/addOrUpdateTask") + @ApiOperation(value = "新增任务") + @LogAnnotation(title = "任务管理", action = "新增任务") + @SuppressWarnings("unchecked") + public String addOrUpdateTask(@RequestBody TbTask vo) { + return optionService.addOrUpdateTask(vo); + } + + + + + + @PostMapping("/userRole") + @ApiOperation(value = "用户角色") + public String userRole() { + String userId = StpUtil.getLoginIdAsString(); + UserOwnRoleRespVO us= userService.getUserOwnRole(userId); + List roleList=us.getAllRole(); + List ownRole=new ArrayList<>(); + List roles=us.getOwnRoles(); + for (SysRole role:roleList){ + for (String id:roles){ + if(role.getId().equals(id)){ + ownRole.add(role); + } + } + } + for (SysRole role:ownRole){ + if(role.getName().contains("督察")){ + return "1"; + }else if(role.getName().contains("巡察")){ + return "2"; + } + else if(role.getName().contains("临时")){ + return "3"; + }else{ + return "0"; + } + } + return "0"; + } + } diff --git a/src/main/java/com/company/project/controller/TemporaryUserController.java b/src/main/java/com/company/project/controller/TemporaryUserController.java new file mode 100644 index 0000000..76fae67 --- /dev/null +++ b/src/main/java/com/company/project/controller/TemporaryUserController.java @@ -0,0 +1,29 @@ +package com.company.project.controller; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author 黑子 + */ +@Api(tags = "临时用户管理") +@Slf4j +@RestController +@RequestMapping("/temp/user/") +public class TemporaryUserController { + + + + + + + + + + + + + +} diff --git a/src/main/java/com/company/project/entity/TbSourceFile.java b/src/main/java/com/company/project/entity/TbSourceFile.java new file mode 100644 index 0000000..dae6293 --- /dev/null +++ b/src/main/java/com/company/project/entity/TbSourceFile.java @@ -0,0 +1,25 @@ +package com.company.project.entity; + +import lombok.Data; + +/** + * @author 黑子 + */ +@Data +public class TbSourceFile { + + private String id; + + private String sourceId; + + private String filePath; + + private String createTime; + + private String fileSuffix; + + private String fileType; + + + +} diff --git a/src/main/java/com/company/project/entity/TbTask.java b/src/main/java/com/company/project/entity/TbTask.java new file mode 100644 index 0000000..24d379d --- /dev/null +++ b/src/main/java/com/company/project/entity/TbTask.java @@ -0,0 +1,49 @@ +package com.company.project.entity; + +import lombok.Data; + +/** + * @author 黑子 + * 任务管理 + */ +@Data +public class TbTask { + /** + * 主键 + */ + private String id; + /** + * 任务类型 + */ + private String taskType; + /** + * 任务时间 + */ + private String taskTime; + /** + * 开始时间 + */ + private String startTime; + /** + * 结束时间 + */ + private String endTime; + /** + * 任务主题 + */ + private String taskTitle; + /** + *主题说明 + */ + private String taskDescribe; + /** + * 二维码路径 + */ + private String filePath; + /** + * 删除文件 + */ + private String delFlag; + + +} diff --git a/src/main/java/com/company/business/entity/TbUserOption.java b/src/main/java/com/company/project/entity/TbUserOption.java similarity index 95% rename from src/main/java/com/company/business/entity/TbUserOption.java rename to src/main/java/com/company/project/entity/TbUserOption.java index 2905156..8901ff1 100644 --- a/src/main/java/com/company/business/entity/TbUserOption.java +++ b/src/main/java/com/company/project/entity/TbUserOption.java @@ -1,4 +1,4 @@ -package com.company.business.entity; +package com.company.project.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.FieldFill; @@ -22,7 +22,7 @@ public class TbUserOption extends BasePageEntity implements Serializable { private String id; @Excel(name = "序号", width = 10.0, orderNum = "1") - private String rowNum; + private int rowNum; /** * 使用人 */ diff --git a/src/main/java/com/company/business/mapper/OptionMapper.java b/src/main/java/com/company/project/mapper/OptionMapper.java similarity index 81% rename from src/main/java/com/company/business/mapper/OptionMapper.java rename to src/main/java/com/company/project/mapper/OptionMapper.java index 0a4d2c1..e7528f9 100644 --- a/src/main/java/com/company/business/mapper/OptionMapper.java +++ b/src/main/java/com/company/project/mapper/OptionMapper.java @@ -1,11 +1,9 @@ -package com.company.business.mapper; +package com.company.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.company.business.entity.TbUserOption; -import com.company.project.entity.SysGenerator; -import com.company.project.entity.SysRole; +import com.company.project.entity.TbUserOption; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/company/project/service/OptionService.java b/src/main/java/com/company/project/service/OptionService.java index cfe5402..88d1be0 100644 --- a/src/main/java/com/company/project/service/OptionService.java +++ b/src/main/java/com/company/project/service/OptionService.java @@ -1,9 +1,9 @@ package com.company.project.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.company.business.entity.TbUserOption; +import com.company.project.entity.TbTask; +import com.company.project.entity.TbUserOption; import java.util.List; @@ -38,4 +38,11 @@ public interface OptionService extends IService { * @return */ void addOption(TbUserOption vo); + + /** + * 新增/修改任务 + * @param vo + * @return + */ + String addOrUpdateTask(TbTask vo); } diff --git a/src/main/java/com/company/project/service/impl/OptionServiceImpl.java b/src/main/java/com/company/project/service/impl/OptionServiceImpl.java index afe95c2..97cbc67 100644 --- a/src/main/java/com/company/project/service/impl/OptionServiceImpl.java +++ b/src/main/java/com/company/project/service/impl/OptionServiceImpl.java @@ -1,10 +1,10 @@ package com.company.project.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.company.business.entity.TbUserOption; -import com.company.business.mapper.OptionMapper; +import com.company.project.entity.TbTask; +import com.company.project.entity.TbUserOption; +import com.company.project.mapper.OptionMapper; import com.company.project.common.exception.BusinessException; import com.company.project.service.OptionService; import lombok.extern.slf4j.Slf4j; @@ -69,4 +69,14 @@ public class OptionServiceImpl extends ServiceImpl } mapper.addOption(vo); } + + /** + * 新增/修改任务 + * @param vo + * @return + */ + @Override + public String addOrUpdateTask(TbTask vo) { + return null; + } } diff --git a/src/main/java/com/company/project/service/impl/UserServiceImpl.java b/src/main/java/com/company/project/service/impl/UserServiceImpl.java index 16018fc..f92d6cf 100644 --- a/src/main/java/com/company/project/service/impl/UserServiceImpl.java +++ b/src/main/java/com/company/project/service/impl/UserServiceImpl.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -41,7 +42,8 @@ import java.util.List; @Service @Slf4j public class UserServiceImpl extends ServiceImpl implements UserService { - + @Resource + private UserService userService; @Resource private SysUserMapper sysUserMapper; @Resource @@ -89,11 +91,41 @@ public class UserServiceImpl extends ServiceImpl impleme sysUser.setDeptNo(sysDept.getDeptNo()); } } + String roleType=getRolType(sysUser.getId()); + respVO.setRoleType(roleType); //saToken StpUtil.login(sysUser.getId()); return respVO; } + + private String getRolType(String userId){ + UserOwnRoleRespVO us= getUserOwnRole(userId); + List roleList=us.getAllRole(); + List ownRole=new ArrayList<>(); + List roles=us.getOwnRoles(); + for (SysRole role:roleList){ + for (String id:roles){ + if(role.getId().equals(id)){ + ownRole.add(role); + } + } + } + for (SysRole role:ownRole){ + if(role.getName().contains("督察")){ + return "1"; + }else if(role.getName().contains("巡察")){ + return "2"; + } + else if(role.getName().contains("临时")){ + return "3"; + }else{ + return "0"; + } + } + return "0"; + } + @Override public void updateUserInfo(SysUser vo) { @@ -247,6 +279,7 @@ public class UserServiceImpl extends ServiceImpl impleme for (SysRole role:list){ if("1".equals(role.getId())){ list.remove(role); + break; } } UserOwnRoleRespVO vo = new UserOwnRoleRespVO(); diff --git a/src/main/java/com/company/project/vo/resp/LoginRespVO.java b/src/main/java/com/company/project/vo/resp/LoginRespVO.java index 08a37e2..9f6e81a 100644 --- a/src/main/java/com/company/project/vo/resp/LoginRespVO.java +++ b/src/main/java/com/company/project/vo/resp/LoginRespVO.java @@ -24,4 +24,6 @@ public class LoginRespVO { private String phone; @ApiModelProperty(value = "用户所拥有的菜单权限(前后端分离返回给前端控制菜单和按钮的显示和隐藏)") private List list; + @ApiModelProperty(value = "角色类型") + private String roleType; } diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 1e8f01a..331fccf 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -8,9 +8,9 @@ spring: datasource: master: username: root - password: 123456 + password: Bonus@admin123! driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/company_project?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8 + url: jdbc:mysql://192.168.0.14:4417/company_project?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=GMT%2b8 oracle: username: root password: 123456 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 12b980d..b44af86 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,12 +1,12 @@ # 端口 server: - port: 8080 + port: 21666 servlet: context-path: /manager spring: profiles: - active: dev + active: prod mvc: throw-exception-if-no-handler-found: true resources: diff --git a/src/main/resources/mapper/mysql/OptionMapper.xml b/src/main/resources/mapper/mysql/OptionMapper.xml index 4887634..0bc020b 100644 --- a/src/main/resources/mapper/mysql/OptionMapper.xml +++ b/src/main/resources/mapper/mysql/OptionMapper.xml @@ -1,6 +1,6 @@ - + insert into tb_user_option( user_name, @@ -16,7 +16,7 @@ update tb_user_option set del_flag=1 WHERE id=#{id} - SELECT id, user_name userName, user_phone userPhone, unit, create_time, create_day createDay, options from tb_user_option @@ -30,9 +30,9 @@ and create_day between #{vo.startTime} and #{vo.endTime} - ORDER BY create_time desc + ORDER BY id desc - SELECT @rownum:=@rownum+1 AS rownum, id, user_name userName, user_phone userPhone, @@ -48,7 +48,7 @@ and create_day between #{vo.startTime} and #{vo.endTime} - order by create_time desc + order by id desc diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 4b7c5a7..901a26a 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -19,11 +19,11 @@
- +
- +
@@ -70,24 +70,26 @@ layer.msg('密码不能为空'); return false; } + $.ajax({ + type: 'POST', + url: ctx + 'sys/user/login', + dataType: "JSON", + data: JSON.stringify(data), + contentType: "application/json", + success: function (res) { - $.ajax({ - type: 'POST', - url: ctx + 'sys/user/login', - dataType: "JSON", - data: JSON.stringify(data), - contentType: "application/json", - success: function (res) { - if (res.code == 0) { - layer.msg('登录成功', {time: 1000}, function () { - window.location = ctx + 'index/home'; - }); - } else { - layer.msg(res.msg); - $("#img").click(); - } + if (res.code == 0) { + CoreUtil.setData("roleType",res.data.roleType); + console.log(CoreUtil.getData("roleType")); + layer.msg('登录成功', {time: 1000}, function () { + window.location = ctx + 'index/home'; + }); + } else { + layer.msg(res.msg); + $("#img").click(); } - }) + } + }) return false; }); diff --git a/src/main/resources/templates/options/option_add.html b/src/main/resources/templates/options/option_add.html new file mode 100644 index 0000000..228a910 --- /dev/null +++ b/src/main/resources/templates/options/option_add.html @@ -0,0 +1,91 @@ + + + + + Title + +
+ + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+ +
+
+
+
+ + + diff --git a/src/main/resources/templates/options/option_list.html b/src/main/resources/templates/options/option_list.html index 7b2fc90..a29d49b 100644 --- a/src/main/resources/templates/options/option_list.html +++ b/src/main/resources/templates/options/option_list.html @@ -11,9 +11,9 @@
-
+
- +
@@ -30,28 +30,72 @@
+ + + + + + + +