Merge remote-tracking branch 'origin/main'

main
wanglei 6 months ago
commit faed673ee5

@ -3,6 +3,7 @@ package com.ruoyi;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; 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 * @author ruoyi
*/ */
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
@EnableScheduling
public class RuoYiApplication public class RuoYiApplication
{ {
public static void main(String[] args) public static void main(String[] args)

@ -147,23 +147,26 @@ public class SysUserController extends BaseController
@Log(title = "用户管理", businessType = BusinessType.INSERT) @Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping("/adds") @PostMapping("/adds")
@Transactional @Transactional
public AjaxResult adds(@RequestParam("num")int num ,@RequestParam("pcId" )Long pcId) public AjaxResult adds(@RequestBody SysUser user)
{ {
List<SysUser> userList = new ArrayList(); List<SysUser> userList = new ArrayList();
if(num>0){ Integer num = user.getNum();
if(num!=null&&num>0){
Long[] roleIds = {100L}; Long[] roleIds = {100L};
for(int i=1;i<=num;i++){ for(int i=1;i<=num;i++){
SysUser user = new SysUser(); SysUser nuser = new SysUser();
user.setPassword(SecurityUtils.encryptPassword("111111")); nuser.setPassword(SecurityUtils.encryptPassword("111111"));
String randomUserName = RandomStringUtils.randomAlphanumeric(8); String randomUserName = RandomStringUtils.randomAlphanumeric(8);
user.setUserName(randomUserName); nuser.setUserName(randomUserName);
user.setNickName(randomUserName); nuser.setNickName(randomUserName);
user.setPcId(pcId); nuser.setPcId(user.getPcId());
user.setCreateBy(getUsername()); nuser.setCreateBy(getUsername());
user.setRoleIds(roleIds); nuser.setRoleIds(roleIds);
userService.insertUser(user); nuser.setItemIds(String.join(",",user.getItemIds()));
user.setPassword("111111"); nuser.setDeptId(user.getDeptId());
userList.add(user); userService.insertUser(nuser);
nuser.setPassword("111111");
userList.add(nuser);
} }
}else{ }else{
return AjaxResult.error("生成数量需大于0"); return AjaxResult.error("生成数量需大于0");

@ -56,9 +56,17 @@ public class SysUser extends BaseEntity
private String password; private String password;
/** 考核评测id */ /** 考核评测id */
@Excel(name = "考核评测id") //@Excel(name = "考核评测id")
private Long pcId; private Long pcId;
/** 考核项ids */
//@Excel(name = "考核项ids")
private String itemIds;
/** 手机uid */
//@Excel(name = "手机uid")
private String uid;
/** 账号状态0正常 1停用 */ /** 账号状态0正常 1停用 */
@Excel(name = "账号状态", readConverterExp = "0=正常,1=停用") @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
private String status; private String status;
@ -95,6 +103,34 @@ public class SysUser extends BaseEntity
/** 角色ID */ /** 角色ID */
private Long roleId; 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() public SysUser()
{ {

@ -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;
/**
* uidController
*
* @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<KhUidRecard> 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<KhUidRecard> list = khUidRecardService.selectKhUidRecardList(khUidRecard);
ExcelUtil<KhUidRecard> util = new ExcelUtil<KhUidRecard>(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));
}
}

@ -1,14 +1,18 @@
package com.ruoyi.kaohe.controller; package com.ruoyi.kaohe.controller;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.kaohe.domain.KhPcEmp; import com.ruoyi.kaohe.domain.KhPcEmp;
import com.ruoyi.kaohe.domain.KhPingce;
import com.ruoyi.kaohe.domain.KhVoteEmp; import com.ruoyi.kaohe.domain.KhVoteEmp;
import com.ruoyi.kaohe.service.IKhPcEmpService; import com.ruoyi.kaohe.service.IKhPcEmpService;
import com.ruoyi.kaohe.service.IKhVoteEmpService; import com.ruoyi.kaohe.service.IKhVoteEmpService;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -35,8 +39,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
*/ */
@RestController @RestController
@RequestMapping("/kaohe/vote") @RequestMapping("/kaohe/vote")
public class KhVoteController extends BaseController public class KhVoteController extends BaseController {
{
@Autowired @Autowired
private IKhVoteService khVoteService; private IKhVoteService khVoteService;
@Autowired @Autowired
@ -44,26 +47,60 @@ public class KhVoteController extends BaseController
@Autowired @Autowired
private IKhVoteEmpService voteEmpService; private IKhVoteEmpService voteEmpService;
/*@Scheduled(cron = "0 * * * * ?") // 每分钟的第0秒执行一次 监测时间修改评分状态
public void performTask() {
System.out.println("进入定时任务-------------------------------------------------------------");
//获取所有未完成的评分任务
List<KhVote> 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')") @PreAuthorize("@ss.hasPermi('kaohe:vote:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(KhVote khVote) public TableDataInfo list(KhVote khVote) {
{
startPage(); startPage();
List<KhVote> list = khVoteService.selectKhVoteList(khVote); List<KhVote> list = khVoteService.selectKhVoteList(khVote);
return getDataTable(list); return getDataTable(list);
} }
/**
* pingceIditemIdsstate
*/
@PreAuthorize("@ss.hasPermi('kaohe:vote:list')")
@GetMapping("/listByConditons")
public TableDataInfo getListByConditons(KhVote khVote) {
startPage();
List<KhVote> list = khVoteService.getListByPcIdAndItemIds(khVote);
return getDataTable(list);
}
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('kaohe:vote:export')") @PreAuthorize("@ss.hasPermi('kaohe:vote:export')")
@Log(title = "投票评测", businessType = BusinessType.EXPORT) @Log(title = "投票评测", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, KhVote khVote) public void export(HttpServletResponse response, KhVote khVote) {
{
List<KhVote> list = khVoteService.selectKhVoteList(khVote); List<KhVote> list = khVoteService.selectKhVoteList(khVote);
ExcelUtil<KhVote> util = new ExcelUtil<KhVote>(KhVote.class); ExcelUtil<KhVote> util = new ExcelUtil<KhVote>(KhVote.class);
util.exportExcel(response, list, "投票评测数据"); util.exportExcel(response, list, "投票评测数据");
@ -74,8 +111,7 @@ public class KhVoteController extends BaseController
*/ */
@PreAuthorize("@ss.hasPermi('kaohe:vote:query')") @PreAuthorize("@ss.hasPermi('kaohe:vote:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id) {
{
return success(khVoteService.selectKhVoteById(id)); return success(khVoteService.selectKhVoteById(id));
} }
@ -86,14 +122,13 @@ public class KhVoteController extends BaseController
@Log(title = "投票评测", businessType = BusinessType.INSERT) @Log(title = "投票评测", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
@Transactional @Transactional
public AjaxResult add(@RequestBody KhVote khVote) public AjaxResult add(@RequestBody KhVote khVote) {
{
khVoteService.insertKhVote(khVote); khVoteService.insertKhVote(khVote);
//根据评测id查询职工评测关联 职工 //根据评测id查询职工评测关联 职工
KhPcEmp query = new KhPcEmp(); KhPcEmp query = new KhPcEmp();
query.setPcId(khVote.getPingceId()); query.setPcId(khVote.getPingceId());
List<KhPcEmp> pcEmps = pcEmpService.selectKhPcEmpList(query); List<KhPcEmp> pcEmps = pcEmpService.selectKhPcEmpList(query);
for(KhPcEmp pcEmp:pcEmps){ for (KhPcEmp pcEmp : pcEmps) {
//新增投票选项关联表 //新增投票选项关联表
KhVoteEmp voteEmp = new KhVoteEmp(); KhVoteEmp voteEmp = new KhVoteEmp();
voteEmp.setBkhdxId(pcEmp.getBkhdxId()); voteEmp.setBkhdxId(pcEmp.getBkhdxId());
@ -112,8 +147,7 @@ public class KhVoteController extends BaseController
@PreAuthorize("@ss.hasPermi('kaohe:vote:edit')") @PreAuthorize("@ss.hasPermi('kaohe:vote:edit')")
@Log(title = "投票评测", businessType = BusinessType.UPDATE) @Log(title = "投票评测", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody KhVote khVote) public AjaxResult edit(@RequestBody KhVote khVote) {
{
return toAjax(khVoteService.updateKhVote(khVote)); return toAjax(khVoteService.updateKhVote(khVote));
} }
@ -123,8 +157,7 @@ public class KhVoteController extends BaseController
@PreAuthorize("@ss.hasPermi('kaohe:vote:remove')") @PreAuthorize("@ss.hasPermi('kaohe:vote:remove')")
@Log(title = "投票评测", businessType = BusinessType.DELETE) @Log(title = "投票评测", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids) {
{
return toAjax(khVoteService.deleteKhVoteByIds(ids)); return toAjax(khVoteService.deleteKhVoteByIds(ids));
} }
} }

@ -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();
}
}

@ -2,6 +2,8 @@ package com.ruoyi.kaohe.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -54,13 +56,13 @@ public class KhVote extends BaseEntity
private String vDescription; private String vDescription;
/** 开始时间 */ /** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date sTime; private Date sTime;
/** 结束时间 */ /** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date eTime; private Date eTime;
/** 最大分数 */ /** 最大分数 */
@ -74,6 +76,20 @@ public class KhVote extends BaseEntity
/** 状态(0 未开始 1 进行中 2 完成) */ /** 状态(0 未开始 1 进行中 2 完成) */
@Excel(name = "状态(0 未开始 1 进行中 2 完成)") @Excel(name = "状态(0 未开始 1 进行中 2 完成)")
private String state; private String state;
/**
*
* @return
*/
private List<Long> itemIds;
public List<Long> getItemIds() {
return itemIds;
}
public void setItemIds(List<Long> itemIds) {
this.itemIds = itemIds;
}
public void setId(Long id) public void setId(Long id)
{ {

@ -0,0 +1,61 @@
package com.ruoyi.kaohe.mapper;
import java.util.List;
import com.ruoyi.kaohe.domain.KhUidRecard;
/**
* uidMapper
*
* @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<KhUidRecard> 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);
}

@ -58,4 +58,8 @@ public interface KhVoteMapper
* @return * @return
*/ */
public int deleteKhVoteByIds(Long[] ids); public int deleteKhVoteByIds(Long[] ids);
List<KhVote> getListByPcIdAndItemIds(KhVote khVote);
List<KhVote> selectUnfinishedVote();
} }

@ -0,0 +1,61 @@
package com.ruoyi.kaohe.service;
import java.util.List;
import com.ruoyi.kaohe.domain.KhUidRecard;
/**
* uidService
*
* @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<KhUidRecard> 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);
}

@ -58,4 +58,8 @@ public interface IKhVoteService
* @return * @return
*/ */
public int deleteKhVoteById(Long id); public int deleteKhVoteById(Long id);
List<KhVote> getListByPcIdAndItemIds(KhVote khVote);
List<KhVote> selectUnfinishedVote();
} }

@ -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;
/**
* uidService
*
* @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<KhUidRecard> 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);
}
}

@ -93,4 +93,14 @@ public class KhVoteServiceImpl implements IKhVoteService
{ {
return khVoteMapper.deleteKhVoteById(id); return khVoteMapper.deleteKhVoteById(id);
} }
@Override
public List<KhVote> getListByPcIdAndItemIds(KhVote khVote) {
return khVoteMapper.getListByPcIdAndItemIds(khVote);
}
@Override
public List<KhVote> selectUnfinishedVote() {
return khVoteMapper.selectUnfinishedVote();
}
} }

@ -0,0 +1,81 @@
<?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.ruoyi.kaohe.mapper.KhUidRecardMapper">
<resultMap type="KhUidRecard" id="KhUidRecardResult">
<result property="id" column="id" />
<result property="uid" column="uid" />
<result property="uName" column="u_name" />
<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="selectKhUidRecardVo">
select id, uid, u_name, create_by, create_time, update_by, update_time, remark from kh_uid_recard
</sql>
<select id="selectKhUidRecardList" parameterType="KhUidRecard" resultMap="KhUidRecardResult">
<include refid="selectKhUidRecardVo"/>
<where>
<if test="uid != null and uid != ''"> and uid = #{uid}</if>
<if test="uName != null and uName != ''"> and u_name like concat('%', #{uName}, '%')</if>
</where>
</select>
<select id="selectKhUidRecardById" parameterType="Long" resultMap="KhUidRecardResult">
<include refid="selectKhUidRecardVo"/>
where id = #{id}
</select>
<insert id="insertKhUidRecard" parameterType="KhUidRecard" useGeneratedKeys="true" keyProperty="id">
insert into kh_uid_recard
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="uid != null">uid,</if>
<if test="uName != null">u_name,</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="uid != null">#{uid},</if>
<if test="uName != null">#{uName},</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="updateKhUidRecard" parameterType="KhUidRecard">
update kh_uid_recard
<trim prefix="SET" suffixOverrides=",">
<if test="uid != null">uid = #{uid},</if>
<if test="uName != null">u_name = #{uName},</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="deleteKhUidRecardById" parameterType="Long">
delete from kh_uid_recard where id = #{id}
</delete>
<delete id="deleteKhUidRecardByIds" parameterType="String">
delete from kh_uid_recard where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

@ -49,6 +49,23 @@
</where> </where>
</select> </select>
<select id="getListByPcIdAndItemIds" parameterType="KhVote" resultMap="KhVoteResult">
select v.*,it.type_id from kh_vote v left join kh_items it on v.khitem_id =it.id
<where>
<if test="pingceId != null "> and pingce_id = #{pingceId}</if>
<if test="state != null and state != ''"> and state = #{state}</if>
<if test="itemIds != null"> and khitem_id in
<foreach item="itemId" collection="itemIds" open="(" separator="," close=")">
#{itemId}
</foreach>
</if>
</where>
</select>
<select id="selectUnfinishedVote" parameterType="KhVote" resultMap="KhVoteResult">
select v.*,it.type_id from kh_vote v left join kh_items it on v.khitem_id =it.id
where v.state !='2'
</select>
<select id="selectKhVoteById" parameterType="Long" resultMap="KhVoteResult"> <select id="selectKhVoteById" parameterType="Long" resultMap="KhVoteResult">
select v.*,it.type_id from kh_vote v left join kh_items it on v.khitem_id =it.id select v.*,it.type_id from kh_vote v left join kh_items it on v.khitem_id =it.id
where v.id = #{id} where v.id = #{id}

@ -34,6 +34,10 @@
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId> <artifactId>ruoyi-common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-kaohe</artifactId>
</dependency>
</dependencies> </dependencies>

@ -1,8 +1,14 @@
package com.ruoyi.quartz.task; package com.ruoyi.quartz.task;
import com.ruoyi.kaohe.domain.KhVote;
import com.ruoyi.kaohe.service.IKhVoteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import java.util.Date;
import java.util.List;
/** /**
* *
* *
@ -11,6 +17,33 @@ import com.ruoyi.common.utils.StringUtils;
@Component("ryTask") @Component("ryTask")
public class RyTask public class RyTask
{ {
@Autowired
private IKhVoteService khVoteService;
public void performTask() {
System.out.println("进入定时任务-------------------------------------------------------------");
//获取所有未完成的评分任务
List<KhVote> 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() + " 状态为已完成");
}
}
}
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
{ {
System.out.println(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i)); System.out.println(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i));

@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="avatar" column="avatar" /> <result property="avatar" column="avatar" />
<result property="password" column="password" /> <result property="password" column="password" />
<result property="pcId" column="pc_id" /> <result property="pcId" column="pc_id" />
<result property="uid" column="uid" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="loginIp" column="login_ip" /> <result property="loginIp" column="login_ip" />
@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectUserVo"> <sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,u.pc_id, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,u.pc_id, u.item_ids,u.uid, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u from sys_user u
@ -59,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql> </sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
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 left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0' where u.del_flag = '0'
<if test="userId != null and userId != 0"> <if test="userId != null and userId != 0">
@ -89,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.pc_id, u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.pc_id,u.item_ids,u.uid, u.email, u.phonenumber, u.status, u.create_time
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role ur on u.user_id = ur.user_id
@ -106,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.pc_id,u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.pc_id, u.item_ids,u.uid,u.email, u.phonenumber, u.status, u.create_time
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role ur on u.user_id = ur.user_id
@ -157,6 +158,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sex != null and sex != ''">sex,</if> <if test="sex != null and sex != ''">sex,</if>
<if test="password != null and password != ''">password,</if> <if test="password != null and password != ''">password,</if>
<if test="pcId != null">pc_id,</if> <if test="pcId != null">pc_id,</if>
<if test="itemIds != null">item_ids,</if>
<if test="uid != null">uid,</if>
<if test="status != null and status != ''">status,</if> <if test="status != null and status != ''">status,</if>
<if test="pwdUpdateDate != null">pwd_update_date,</if> <if test="pwdUpdateDate != null">pwd_update_date,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
@ -173,6 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sex != null and sex != ''">#{sex},</if> <if test="sex != null and sex != ''">#{sex},</if>
<if test="password != null and password != ''">#{password},</if> <if test="password != null and password != ''">#{password},</if>
<if test="pcId != null">#{pcId},</if> <if test="pcId != null">#{pcId},</if>
<if test="itemIds != null">#{itemIds},</if>
<if test="uid != null">#{uid},</if>
<if test="status != null and status != ''">#{status},</if> <if test="status != null and status != ''">#{status},</if>
<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if> <if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
@ -192,6 +197,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="avatar != null and avatar != ''">avatar = #{avatar},</if> <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
<if test="password != null and password != ''">password = #{password},</if> <if test="password != null and password != ''">password = #{password},</if>
<if test="pcId != null">pc_id = #{pcId},</if> <if test="pcId != null">pc_id = #{pcId},</if>
<if test="itemIds != null">item_ids = #{itemIds},</if>
<if test="uid != null">uid = #{uid},</if>
<if test="status != null and status != ''">status = #{status},</if> <if test="status != null and status != ''">status = #{status},</if>
<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if> <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
<if test="loginDate != null">login_date = #{loginDate},</if> <if test="loginDate != null">login_date = #{loginDate},</if>

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询uid管理列表
export function listUid(query) {
return request({
url: '/kaohe/uid/list',
method: 'get',
params: query
})
}
// 查询uid管理详细
export function getUid(id) {
return request({
url: '/kaohe/uid/' + id,
method: 'get'
})
}
// 新增uid管理
export function addUid(data) {
return request({
url: '/kaohe/uid',
method: 'post',
data: data
})
}
// 修改uid管理
export function updateUid(data) {
return request({
url: '/kaohe/uid',
method: 'put',
data: data
})
}
// 删除uid管理
export function delUid(id) {
return request({
url: '/kaohe/uid/' + id,
method: 'delete'
})
}

@ -0,0 +1,268 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="手机标识符" prop="uid">
<el-input
v-model="queryParams.uid"
placeholder="请输入手机标识符"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="标识符对应姓名" prop="uName">
<el-input
v-model="queryParams.uName"
placeholder="请输入标识符对应姓名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['kaohe:uid:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['kaohe:uid:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['kaohe:uid:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['kaohe:uid:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="uidList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="手机标识符" align="center" prop="uid" />
<el-table-column label="标识符对应姓名" align="center" prop="uName" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['kaohe:uid:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['kaohe:uid:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改uid管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="手机标识符" prop="uid">
<el-input v-model="form.uid" placeholder="请输入手机标识符" />
</el-form-item>
<el-form-item label="标识符对应姓名" prop="uName">
<el-input v-model="form.uName" placeholder="请输入标识符对应姓名" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listUid, getUid, delUid, addUid, updateUid } from "@/api/kaohe/uid"
export default {
name: "Uid",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// uid
uidList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
uid: null,
uName: null,
},
//
form: {},
//
rules: {
}
}
},
created() {
this.getList()
},
methods: {
/** 查询uid管理列表 */
getList() {
this.loading = true
listUid(this.queryParams).then(response => {
this.uidList = response.rows
this.total = response.total
this.loading = false
})
},
//
cancel() {
this.open = false
this.reset()
},
//
reset() {
this.form = {
id: null,
uid: null,
uName: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
}
this.resetForm("form")
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm")
this.handleQuery()
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = "添加uid管理"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getUid(id).then(response => {
this.form = response.data
this.open = true
this.title = "修改uid管理"
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateUid(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
} else {
addUid(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除uid管理编号为"' + ids + '"的数据项?').then(function() {
return delUid(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
this.download('kaohe/uid/export', {
...this.queryParams
}, `uid_${new Date().getTime()}.xlsx`)
}
}
}
</script>
Loading…
Cancel
Save