diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 32eb6f1..775f772 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -3,6 +3,7 @@ package com.ruoyi; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.scheduling.annotation.EnableScheduling; /** * 启动程序 @@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author ruoyi */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) +@EnableScheduling public class RuoYiApplication { public static void main(String[] args) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index a3291a9..ee030b6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -147,23 +147,26 @@ public class SysUserController extends BaseController @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping("/adds") @Transactional - public AjaxResult adds(@RequestParam("num")int num ,@RequestParam("pcId" )Long pcId) + public AjaxResult adds(@RequestBody SysUser user) { List userList = new ArrayList(); - if(num>0){ + Integer num = user.getNum(); + if(num!=null&&num>0){ Long[] roleIds = {100L}; for(int i=1;i<=num;i++){ - SysUser user = new SysUser(); - user.setPassword(SecurityUtils.encryptPassword("111111")); + SysUser nuser = new SysUser(); + nuser.setPassword(SecurityUtils.encryptPassword("111111")); String randomUserName = RandomStringUtils.randomAlphanumeric(8); - user.setUserName(randomUserName); - user.setNickName(randomUserName); - user.setPcId(pcId); - user.setCreateBy(getUsername()); - user.setRoleIds(roleIds); - userService.insertUser(user); - user.setPassword("111111"); - userList.add(user); + nuser.setUserName(randomUserName); + nuser.setNickName(randomUserName); + nuser.setPcId(user.getPcId()); + nuser.setCreateBy(getUsername()); + nuser.setRoleIds(roleIds); + nuser.setItemIds(String.join(",",user.getItemIds())); + nuser.setDeptId(user.getDeptId()); + userService.insertUser(nuser); + nuser.setPassword("111111"); + userList.add(nuser); } }else{ return AjaxResult.error("生成数量需大于0"); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 700bf2b..afa393a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -56,9 +56,17 @@ public class SysUser extends BaseEntity private String password; /** 考核评测id */ - @Excel(name = "考核评测id") + //@Excel(name = "考核评测id") private Long pcId; + /** 考核项ids */ + //@Excel(name = "考核项ids") + private String itemIds; + + /** 手机uid */ + //@Excel(name = "手机uid") + private String uid; + /** 账号状态(0正常 1停用) */ @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用") private String status; @@ -95,6 +103,34 @@ public class SysUser extends BaseEntity /** 角色ID */ private Long roleId; + /** + * 仅做参数使用,批量生成用户的数量 + */ + private Integer num; + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + + public Integer getNum() { + return num; + } + + public void setNum(Integer num) { + this.num = num; + } + + public String getItemIds() { + return itemIds; + } + + public void setItemIds(String itemIds) { + this.itemIds = itemIds; + } public SysUser() { diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhUidRecardController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhUidRecardController.java new file mode 100644 index 0000000..190dfa2 --- /dev/null +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhUidRecardController.java @@ -0,0 +1,104 @@ +package com.ruoyi.kaohe.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.kaohe.domain.KhUidRecard; +import com.ruoyi.kaohe.service.IKhUidRecardService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * uid管理Controller + * + * @author hs + * @date 2025-07-02 + */ +@RestController +@RequestMapping("/kaohe/uid") +public class KhUidRecardController extends BaseController +{ + @Autowired + private IKhUidRecardService khUidRecardService; + + /** + * 查询uid管理列表 + */ + @PreAuthorize("@ss.hasPermi('kaohe:uid:list')") + @GetMapping("/list") + public TableDataInfo list(KhUidRecard khUidRecard) + { + startPage(); + List list = khUidRecardService.selectKhUidRecardList(khUidRecard); + return getDataTable(list); + } + + /** + * 导出uid管理列表 + */ + @PreAuthorize("@ss.hasPermi('kaohe:uid:export')") + @Log(title = "uid管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, KhUidRecard khUidRecard) + { + List list = khUidRecardService.selectKhUidRecardList(khUidRecard); + ExcelUtil util = new ExcelUtil(KhUidRecard.class); + util.exportExcel(response, list, "uid管理数据"); + } + + /** + * 获取uid管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('kaohe:uid:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(khUidRecardService.selectKhUidRecardById(id)); + } + + /** + * 新增uid管理 + */ + @PreAuthorize("@ss.hasPermi('kaohe:uid:add')") + @Log(title = "uid管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody KhUidRecard khUidRecard) + { + return toAjax(khUidRecardService.insertKhUidRecard(khUidRecard)); + } + + /** + * 修改uid管理 + */ + @PreAuthorize("@ss.hasPermi('kaohe:uid:edit')") + @Log(title = "uid管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody KhUidRecard khUidRecard) + { + return toAjax(khUidRecardService.updateKhUidRecard(khUidRecard)); + } + + /** + * 删除uid管理 + */ + @PreAuthorize("@ss.hasPermi('kaohe:uid:remove')") + @Log(title = "uid管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(khUidRecardService.deleteKhUidRecardByIds(ids)); + } +} diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java index 511dee6..3978e4d 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java @@ -1,14 +1,18 @@ package com.ruoyi.kaohe.controller; +import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ruoyi.kaohe.domain.KhPcEmp; +import com.ruoyi.kaohe.domain.KhPingce; import com.ruoyi.kaohe.domain.KhVoteEmp; import com.ruoyi.kaohe.service.IKhPcEmpService; import com.ruoyi.kaohe.service.IKhVoteEmpService; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -29,14 +33,13 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 投票评测Controller - * + * * @author hs * @date 2025-06-17 */ @RestController @RequestMapping("/kaohe/vote") -public class KhVoteController extends BaseController -{ +public class KhVoteController extends BaseController { @Autowired private IKhVoteService khVoteService; @Autowired @@ -44,26 +47,60 @@ public class KhVoteController extends BaseController @Autowired private IKhVoteEmpService voteEmpService; + /*@Scheduled(cron = "0 * * * * ?") // 每分钟的第0秒执行一次 监测时间修改评分状态 + public void performTask() { + System.out.println("进入定时任务-------------------------------------------------------------"); + //获取所有未完成的评分任务 + List list = khVoteService.selectUnfinishedVote(); + for (KhVote vote : list) { + Date sTime = vote.getsTime(); + Date eTime = vote.geteTime(); + String state = vote.getState(); + // 获取当前日期和时间 + Date now = new Date(); + // 根据当前时间与开始、结束时间关系 修改状态 + if (state.equals("0") && (now.after(sTime) && now.before(eTime))) { + vote.setState("1"); + khVoteService.updateKhVote(vote); + System.out.println("执行定时任务: " + System.currentTimeMillis() + " 修改评分任务: " + vote.getVoteTitle() + " 状态为进行中"); + } + if (now.after(eTime)) { + vote.setState("2"); + khVoteService.updateKhVote(vote); + System.out.println("执行定时任务: " + System.currentTimeMillis() + " 修改评分任务: " + vote.getVoteTitle() + " 状态为已完成"); + } + } + }*/ + /** * 查询投票评测列表 */ @PreAuthorize("@ss.hasPermi('kaohe:vote:list')") @GetMapping("/list") - public TableDataInfo list(KhVote khVote) - { + public TableDataInfo list(KhVote khVote) { startPage(); List list = khVoteService.selectKhVoteList(khVote); return getDataTable(list); } + /** + * 首页根据pingceId、itemIds、state查询投票评测列表 + */ + @PreAuthorize("@ss.hasPermi('kaohe:vote:list')") + @GetMapping("/listByConditons") + public TableDataInfo getListByConditons(KhVote khVote) { + startPage(); + List list = khVoteService.getListByPcIdAndItemIds(khVote); + return getDataTable(list); + } + /** * 导出投票评测列表 */ @PreAuthorize("@ss.hasPermi('kaohe:vote:export')") @Log(title = "投票评测", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, KhVote khVote) - { + public void export(HttpServletResponse response, KhVote khVote) { List list = khVoteService.selectKhVoteList(khVote); ExcelUtil util = new ExcelUtil(KhVote.class); util.exportExcel(response, list, "投票评测数据"); @@ -74,8 +111,7 @@ public class KhVoteController extends BaseController */ @PreAuthorize("@ss.hasPermi('kaohe:vote:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(khVoteService.selectKhVoteById(id)); } @@ -86,14 +122,13 @@ public class KhVoteController extends BaseController @Log(title = "投票评测", businessType = BusinessType.INSERT) @PostMapping @Transactional - public AjaxResult add(@RequestBody KhVote khVote) - { + public AjaxResult add(@RequestBody KhVote khVote) { khVoteService.insertKhVote(khVote); //根据评测id查询职工评测关联 职工 KhPcEmp query = new KhPcEmp(); query.setPcId(khVote.getPingceId()); List pcEmps = pcEmpService.selectKhPcEmpList(query); - for(KhPcEmp pcEmp:pcEmps){ + for (KhPcEmp pcEmp : pcEmps) { //新增投票选项关联表 KhVoteEmp voteEmp = new KhVoteEmp(); voteEmp.setBkhdxId(pcEmp.getBkhdxId()); @@ -112,8 +147,7 @@ public class KhVoteController extends BaseController @PreAuthorize("@ss.hasPermi('kaohe:vote:edit')") @Log(title = "投票评测", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody KhVote khVote) - { + public AjaxResult edit(@RequestBody KhVote khVote) { return toAjax(khVoteService.updateKhVote(khVote)); } @@ -122,9 +156,8 @@ public class KhVoteController extends BaseController */ @PreAuthorize("@ss.hasPermi('kaohe:vote:remove')") @Log(title = "投票评测", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(khVoteService.deleteKhVoteByIds(ids)); } } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhUidRecard.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhUidRecard.java new file mode 100644 index 0000000..e632dd8 --- /dev/null +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhUidRecard.java @@ -0,0 +1,72 @@ +package com.ruoyi.kaohe.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * uid管理对象 kh_uid_recard + * + * @author hs + * @date 2025-07-02 + */ +public class KhUidRecard extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 手机标识符 */ + @Excel(name = "手机标识符") + private String uid; + + /** 标识符对应姓名 */ + @Excel(name = "标识符对应姓名") + private String uName; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setUid(String uid) + { + this.uid = uid; + } + + public String getUid() + { + return uid; + } + + public void setuName(String uName) + { + this.uName = uName; + } + + public String getuName() + { + return uName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("uid", getUid()) + .append("uName", getuName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java index 531a7e1..f9f4a31 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java @@ -2,6 +2,8 @@ package com.ruoyi.kaohe.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -54,13 +56,13 @@ public class KhVote extends BaseEntity private String vDescription; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date sTime; /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date eTime; /** 最大分数 */ @@ -74,6 +76,20 @@ public class KhVote extends BaseEntity /** 状态(0 未开始 1 进行中 2 完成) */ @Excel(name = "状态(0 未开始 1 进行中 2 完成)") private String state; + /** + * 仅用作评分账号查看首页对应评分 的参数 + * @return + */ + private List itemIds; + + + public List getItemIds() { + return itemIds; + } + + public void setItemIds(List itemIds) { + this.itemIds = itemIds; + } public void setId(Long id) { diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhUidRecardMapper.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhUidRecardMapper.java new file mode 100644 index 0000000..83fc3b6 --- /dev/null +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhUidRecardMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.kaohe.mapper; + +import java.util.List; +import com.ruoyi.kaohe.domain.KhUidRecard; + +/** + * uid管理Mapper接口 + * + * @author hs + * @date 2025-07-02 + */ +public interface KhUidRecardMapper +{ + /** + * 查询uid管理 + * + * @param id uid管理主键 + * @return uid管理 + */ + public KhUidRecard selectKhUidRecardById(Long id); + + /** + * 查询uid管理列表 + * + * @param khUidRecard uid管理 + * @return uid管理集合 + */ + public List selectKhUidRecardList(KhUidRecard khUidRecard); + + /** + * 新增uid管理 + * + * @param khUidRecard uid管理 + * @return 结果 + */ + public int insertKhUidRecard(KhUidRecard khUidRecard); + + /** + * 修改uid管理 + * + * @param khUidRecard uid管理 + * @return 结果 + */ + public int updateKhUidRecard(KhUidRecard khUidRecard); + + /** + * 删除uid管理 + * + * @param id uid管理主键 + * @return 结果 + */ + public int deleteKhUidRecardById(Long id); + + /** + * 批量删除uid管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteKhUidRecardByIds(Long[] ids); +} diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhVoteMapper.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhVoteMapper.java index c208300..18ea116 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhVoteMapper.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhVoteMapper.java @@ -58,4 +58,8 @@ public interface KhVoteMapper * @return 结果 */ public int deleteKhVoteByIds(Long[] ids); + + List getListByPcIdAndItemIds(KhVote khVote); + + List selectUnfinishedVote(); } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhUidRecardService.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhUidRecardService.java new file mode 100644 index 0000000..85e2dbb --- /dev/null +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhUidRecardService.java @@ -0,0 +1,61 @@ +package com.ruoyi.kaohe.service; + +import java.util.List; +import com.ruoyi.kaohe.domain.KhUidRecard; + +/** + * uid管理Service接口 + * + * @author hs + * @date 2025-07-02 + */ +public interface IKhUidRecardService +{ + /** + * 查询uid管理 + * + * @param id uid管理主键 + * @return uid管理 + */ + public KhUidRecard selectKhUidRecardById(Long id); + + /** + * 查询uid管理列表 + * + * @param khUidRecard uid管理 + * @return uid管理集合 + */ + public List selectKhUidRecardList(KhUidRecard khUidRecard); + + /** + * 新增uid管理 + * + * @param khUidRecard uid管理 + * @return 结果 + */ + public int insertKhUidRecard(KhUidRecard khUidRecard); + + /** + * 修改uid管理 + * + * @param khUidRecard uid管理 + * @return 结果 + */ + public int updateKhUidRecard(KhUidRecard khUidRecard); + + /** + * 批量删除uid管理 + * + * @param ids 需要删除的uid管理主键集合 + * @return 结果 + */ + public int deleteKhUidRecardByIds(Long[] ids); + + /** + * 删除uid管理信息 + * + * @param id uid管理主键 + * @return 结果 + */ + public int deleteKhUidRecardById(Long id); +} diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteService.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteService.java index 14d0eca..7c413bb 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteService.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteService.java @@ -58,4 +58,8 @@ public interface IKhVoteService * @return 结果 */ public int deleteKhVoteById(Long id); + + List getListByPcIdAndItemIds(KhVote khVote); + + List selectUnfinishedVote(); } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhUidRecardServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhUidRecardServiceImpl.java new file mode 100644 index 0000000..966b2e1 --- /dev/null +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhUidRecardServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.kaohe.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.kaohe.mapper.KhUidRecardMapper; +import com.ruoyi.kaohe.domain.KhUidRecard; +import com.ruoyi.kaohe.service.IKhUidRecardService; + +/** + * uid管理Service业务层处理 + * + * @author hs + * @date 2025-07-02 + */ +@Service +public class KhUidRecardServiceImpl implements IKhUidRecardService +{ + @Autowired + private KhUidRecardMapper khUidRecardMapper; + + /** + * 查询uid管理 + * + * @param id uid管理主键 + * @return uid管理 + */ + @Override + public KhUidRecard selectKhUidRecardById(Long id) + { + return khUidRecardMapper.selectKhUidRecardById(id); + } + + /** + * 查询uid管理列表 + * + * @param khUidRecard uid管理 + * @return uid管理 + */ + @Override + public List selectKhUidRecardList(KhUidRecard khUidRecard) + { + return khUidRecardMapper.selectKhUidRecardList(khUidRecard); + } + + /** + * 新增uid管理 + * + * @param khUidRecard uid管理 + * @return 结果 + */ + @Override + public int insertKhUidRecard(KhUidRecard khUidRecard) + { + khUidRecard.setCreateTime(DateUtils.getNowDate()); + return khUidRecardMapper.insertKhUidRecard(khUidRecard); + } + + /** + * 修改uid管理 + * + * @param khUidRecard uid管理 + * @return 结果 + */ + @Override + public int updateKhUidRecard(KhUidRecard khUidRecard) + { + khUidRecard.setUpdateTime(DateUtils.getNowDate()); + return khUidRecardMapper.updateKhUidRecard(khUidRecard); + } + + /** + * 批量删除uid管理 + * + * @param ids 需要删除的uid管理主键 + * @return 结果 + */ + @Override + public int deleteKhUidRecardByIds(Long[] ids) + { + return khUidRecardMapper.deleteKhUidRecardByIds(ids); + } + + /** + * 删除uid管理信息 + * + * @param id uid管理主键 + * @return 结果 + */ + @Override + public int deleteKhUidRecardById(Long id) + { + return khUidRecardMapper.deleteKhUidRecardById(id); + } +} diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteServiceImpl.java index 91efb28..236ae8e 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteServiceImpl.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteServiceImpl.java @@ -93,4 +93,14 @@ public class KhVoteServiceImpl implements IKhVoteService { return khVoteMapper.deleteKhVoteById(id); } + + @Override + public List getListByPcIdAndItemIds(KhVote khVote) { + return khVoteMapper.getListByPcIdAndItemIds(khVote); + } + + @Override + public List selectUnfinishedVote() { + return khVoteMapper.selectUnfinishedVote(); + } } diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhUidRecardMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhUidRecardMapper.xml new file mode 100644 index 0000000..559b7d3 --- /dev/null +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhUidRecardMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + select id, uid, u_name, create_by, create_time, update_by, update_time, remark from kh_uid_recard + + + + + + + + insert into kh_uid_recard + + uid, + u_name, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{uid}, + #{uName}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update kh_uid_recard + + uid = #{uid}, + u_name = #{uName}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from kh_uid_recard where id = #{id} + + + + delete from kh_uid_recard where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml index 39f8e19..a7b72e2 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml @@ -49,6 +49,23 @@ + + + - select u.user_id, u.dept_id, u.nick_name, u.user_name,u.pc_id, u.sex, u.email, u.avatar, u.phonenumber, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u + select u.user_id, u.dept_id, u.nick_name, u.user_name,u.pc_id, u.item_ids,u.uid, u.sex, u.email, u.avatar, u.phonenumber, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' @@ -89,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"