定时任务获取用户名问题、保养工单查询

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/CmmsUpkeepMapper.java

@@ -14,4 +14,22 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
 
+    /**
+     * 查询保养工单列表-我的代办
+     *
+     * @param cmmsUpkeep 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeep> selectMyChargeList(CmmsUpkeep cmmsUpkeep);
+
+    /**
+     * 查询保养工单列表-我的相关
+     *
+     * @param cmmsUpkeep 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeep> selectMyRelateList(CmmsUpkeep cmmsUpkeep);
+
+
+
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/xml/CmmsUpkeepMapper.xml

@@ -2,4 +2,55 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsUpkeep.mapper.CmmsUpkeepMapper">
 
-</mapper>
+    <resultMap type="CmmsUpkeep" id="CmmsUpkeepResult">
+        <result property="id"    column="id"    />
+        <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"    />
+        <result property="upkeepcode"    column="upkeepcode"    />
+        <result property="upkeepname"    column="upkeepname"    />
+        <result property="upkeepplanid"    column="upkeepplanid"    />
+        <result property="upkeepprojid"    column="upkeepprojid"    />
+        <result property="projectname"    column="projectname"    />
+        <result property="planname"    column="planname"    />
+        <result property="address"    column="address"    />
+        <result property="supplier"    column="supplier"    />
+        <result property="suppliertel"    column="suppliertel"    />
+        <result property="linker"    column="linker"    />
+        <result property="linkertel"    column="linkertel"    />
+        <result property="chargeruser"    column="chargeruser"    />
+        <result property="upkeepdesc"    column="upkeepdesc"    />
+        <result property="status"    column="status"    />
+        <result property="opinion"    column="opinion"    />
+    </resultMap>
+
+    <!-- 查询我的代办 -->
+    <select id="selectMyChargeList" parameterType="CmmsUpkeep" resultMap="CmmsUpkeepResult">
+        select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark, c.upkeepcode,
+        c.upkeepplanid, c.upkeepprojid, c.projectname, c.planname, c.address, c.supplier, c.suppliertel,
+        c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion
+        from ems_cmms_upkeep as c
+        <where>
+            <if test="upkeepcode != null and upkeepcode != ''"> and (c.upkeepcode like concat('%', #{upkeepcode}, '%') or c.upkeepname like concat('%', #{upkeepcode}, '%'))</if>
+            <if test="chargeruser != null and chargeruser != ''"> and concat(chargeruser,',') like concat('%', #{chargeruser}, ',%')</if>
+            <if test="status != null and status != ''"> and status = #{status}</if>
+            <if test="status == null or status == ''"> and status in ('0','1')</if>
+        </where>
+    </select>
+
+    <!-- 查询我的相关 -->
+    <select id="selectMyRelateList" parameterType="CmmsUpkeep" resultMap="CmmsUpkeepResult">
+        select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark, c.upkeepcode,
+        c.upkeepplanid, c.upkeepprojid, c.projectname, c.planname, c.address, c.supplier, c.suppliertel,
+        c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion
+        from cmms_upkeep as c
+        <where>
+            <if test="upkeepcode != null and upkeepcode != ''"> and (c.upkeepcode like concat('%', #{upkeepcode}, '%') or c.upkeepname like concat('%', #{upkeepcode}, '%'))</if>
+            <if test="chargeruser != null and chargeruser != ''"> and (concat(c.chargeruser,',') like concat('%', #{chargeruser}, ',%') or exists (select nodeid from cmms_order_node where relid=c.upkeepid and create_by=#{chargeruser}))</if>
+            <if test="status != null and status != ''"> and c.status = #{status}</if>
+        </where>
+    </select>
+
+</mapper>

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/task/CmmsUpkeepCreateJob.java

@@ -3,9 +3,13 @@ package org.jeecg.modules.cmmsUpkeep.task;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.util.ThreadContext;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.jeecg.common.api.dto.message.MessageDTO;
 import org.jeecg.common.constant.enums.MessageTypeEnum;
 import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
 import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
@@ -13,6 +17,7 @@ import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
 import org.jeecg.modules.cmmsUpkeep.service.ICmmsUpkeepService;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
 import org.jeecg.modules.cmmsUpkeepPlan.service.ICmmsUpkeepPlanService;
+import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.PlanToOrderUtils;
 import org.jeecg.modules.util.UserConstants;
@@ -20,6 +25,7 @@ import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -58,7 +64,22 @@ public class CmmsUpkeepCreateJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+
         System.out.println("进入生成保养工单任务函数");
+        DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
+        ThreadContext.bind(manager);
+
+        // 获取登录人用户信息 V1.0版本：
+//        SysUser user= (SysUser)SecurityUtils.getSubject().getPrincipal();
+        // 获取登录人用户信息 V2.0版本：
+        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(user == null){
+            log.info("用户还未登陆，无法获取创建人！");
+            return;
+        }
+        // 用户名
+        String userName=user.getUsername();
+
         PlanToOrderUtils planToOrderUtils = new PlanToOrderUtils();
         // 获取所有保养计划（根据状态来获取，获取启用的保养计划）
         List<CmmsUpkeepPlan> cmmsUpkeepPlanList = cmmsUpkeepPlanService.getCmmsUpkeepPlanByStatus("0");
@@ -89,6 +110,7 @@ public class CmmsUpkeepCreateJob implements Job {
             //生成保养工单
             CmmsUpkeep cmmsUpkeep = new CmmsUpkeep();
             cmmsUpkeep.setId(IdWorker.getIdStr());//生成雪花id
+            cmmsUpkeep.setCreateBy("admin");
             cmmsUpkeep.setUpkeepcode(autoCodeUtil.genSerialCode(UserConstants.CMMSUPKEEP_CODE, null));//保养工单编号
             cmmsUpkeep.setUpkeepname(cmmsUpkeepPlan.getPlanname() + "-" + dateNowStr);//保养工单名称:保养计划名称-当前时间
             cmmsUpkeep.setUpkeepplanid(cmmsUpkeepPlan.getId());//保养计划id
@@ -103,18 +125,21 @@ public class CmmsUpkeepCreateJob implements Job {
             cmmsUpkeep.setChargeruser(cmmsUpkeepPlan.getChargeruser());//负责人
             cmmsUpkeep.setUpkeepdesc(cmmsUpkeepPlan.getPlandesc());//描述
             cmmsUpkeep.setStatus("0");//保养工单状态
-//                cmmsUpkeepService.save(cmmsUpkeep);
+//            cmmsUpkeepService.save(cmmsUpkeep);
             cmmsUpkeepList.add(cmmsUpkeep);
             //保养操作记录生成
             CmmsOrderNode node = new CmmsOrderNode();
             node.setNodename("0");
             node.setRelid(cmmsUpkeep.getId());//操作记录对应的工单id
+            node.setCreateBy(userName);
             node.setCreateBy("admin");
-            node.setCreateTime(dateNow);
+//            node.setCreateTime(dateNow);
             node.setHandledate(dateNow);
             node.setOpinion("——");
+//            cmmsOrderNodeService.save(node);
             nodeList.add(node);
         }
+        System.out.println(cmmsUpkeepList);
         System.out.println(nodeList);
 
         if (cmmsUpkeepPlanList != null && cmmsUpkeepPlanList.size() > 0) {

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/task/CmmsUpkeepNoticeJob.java

@@ -7,12 +7,8 @@ import org.jeecg.common.api.dto.message.MessageDTO;
 import org.jeecg.common.constant.enums.MessageTypeEnum;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
-import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
 import org.jeecg.modules.cmmsUpkeepPlan.service.ICmmsUpkeepPlanService;
-import org.jeecg.modules.util.PlanToOrderUtils;
-import org.jeecg.modules.util.UserConstants;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -44,7 +40,6 @@ public class CmmsUpkeepNoticeJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         System.out.println("进入保养工单生成提醒任务函数");
-        PlanToOrderUtils planToOrderUtils = new PlanToOrderUtils();
         Date now = DateUtils.getDate();
         // 1、保养计划
         // 获取所有启用的保养计划