修改bug

bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/config/MyFilter.java

@@ -38,10 +38,6 @@ public class MyFilter extends OncePerRequestFilter {
                         return;
                     }
              }
-             if("/dhkq/data".equals(request.getRequestURI())){
-                 filterChain.doFilter(request, response);
-                 return;
-             }
             //解决 无法流重复读取的问题
             ReadHttpRequestWrapper requestWrapper = new ReadHttpRequestWrapper(request, request.getParameterMap());
             filterChain.doFilter(requestWrapper, response);

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java

@@ -73,6 +73,10 @@ public class PmWorkerExitController extends BaseController {
             for (int i = 0; i < listFile.size(); i++) {
                 listFile.get(i).setFile(files[i]);
             }
+            if(o.getProId()==null){
+                return   AjaxResult.error("请填写出厂工程");
+            }
+
             return toAjax(service.updateWorkerExit(o,listFile));
         } catch (Exception e) {
             logger.error(e.toString(), e);

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerExitServiceImpl.java

@@ -11,6 +11,7 @@ import com.bonus.common.core.constant.SecurityConstants;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.system.api.RemoteUrkUtilsService;
 import com.bonus.system.api.model.UploadFileVo;
+import org.hibernate.validator.internal.util.StringHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -51,6 +52,7 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService {
 
     @Override
     public int updateWorkerExit(PmWorkerDto record, List<WebFileDto> listFile) {
+
         //删除合同
         int m = contractService.deleteByWorkerId(record.getWorkerId());
         //删除实时在场
@@ -73,6 +75,7 @@ public class PmWorkerExitServiceImpl implements PmWorkerExitService {
 
         int k = mapper.updateEinProRecordStatus(record.getId(),einStatus,isUploadFile);
         if(k==1){
+
             remoteUrkUtilsService.delUserByDevice(record.getId(),record.getProId(),SecurityConstants.INNER);
         }
         return k;

bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/TaskMapper.java

@@ -47,4 +47,11 @@ public interface TaskMapper {
      * @param userList
      */
     void insertUserIssued(@Param("taskVo") DeviceTaskVo taskVo,@Param("list") List<String> userList);
+
+    /**
+     * 更新时间
+     * @param devCode
+     * @return
+     */
+    List<DeviceTaskVo> selectCmdBlockTask(String devCode);
 }

bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/SendUserService.java

@@ -28,7 +28,7 @@ import java.util.Map;
 @Service
 public class SendUserService {
 
-    public final static int PAGE_SIZE=200;
+    public final static int PAGE_SIZE=10;
 
 
     @Resource

bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/TaskService.java

@@ -499,6 +499,10 @@ public class TaskService {
     }
 
     public List<DeviceTaskVo> selectCmdTaskList(String devCode) {
-        return    mapper.selectCmdTaskList(devCode);
+        List<DeviceTaskVo> list=  mapper.selectCmdTaskList(devCode);
+        if(StringUtils.isEmpty(list)){
+            list=  mapper.selectCmdBlockTask(devCode);
+        }
+        return  list;
     }
 }

bonus-modules/bonus-urk/src/main/java/com/bonus/urk/servlet/DeviceServlet.java

@@ -72,7 +72,7 @@ public class DeviceServlet extends HttpServlet {
             resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.ERROR_NO_CMD);
             return;
         }
-        redisUtils.setCacheObject("att_dev:status:"+deviceVo.getDevCode(),1,600L, TimeUnit.SECONDS);
+        redisUtils.setCacheObject("att_dev:status:"+deviceVo.getDevCode(),"1",600L, TimeUnit.SECONDS);
         String asTransId = req.getHeader(Constant.DEVICE_HEADER_TRANS_ID);
         String requestCode = req.getHeader(Constant.DEVICE_HEADER_REQUEST_CODE);
       // zSetOperations.add(CacheConstant.DEVICE_ONLINE_SET_CACHE, deviceVo.getDevCode(), System.currentTimeMillis());

bonus-modules/bonus-urk/src/main/resources/mapper/urk/SendUserMapper.xml

@@ -16,7 +16,7 @@
         )
     </insert>
     <insert id="insertCmdTaskHistory">
-        insert into kq_cmd_task (id,
+        insert into kq_cmd_task_history (id,
             cmd_code,  cmd_param,   device_code,   trans_status,
             create_time, update_state,   msg, pro_id
         )values (#{id},#{cmdCode},#{cmdParam},#{deviceCode},#{transStatus},#{createTime},#{updateStatus},#{msg},#{proId}

bonus-modules/bonus-urk/src/main/resources/mapper/urk/TaskMapper.xml

@@ -24,6 +24,7 @@
                update_state
         from kq_cmd_task
         where  device_code=#{devCode} and trans_status in (0,3)
+        ORDER BY create_time ASC
     </select>
     <select id="getTaskUserList" resultType="java.lang.String">
         select   user_id userId
@@ -39,10 +40,23 @@
         where ktu.task_id=#{taskId}
 
     </select>
+    <!--查询执行中阻塞的数据-->
+    <select id="selectCmdBlockTask" resultType="com.bonus.urk.vo.DeviceTaskVo">
+        select id, cmd_code cmdCode,
+        cmd_param cmdParam,
+        device_code deviceCode,
+        trans_status transStatus,
+        trans_status_update_time updateTime,
+        create_time createTime,
+        update_state
+        from kq_cmd_task
+        where    device_code=#{devCode} and trans_status in (1)
+        and  trans_status_update_time is not null  and  trans_status_update_time &lt; NOW() - INTERVAL 1 HOUR
+    </select>
 
     <!--更新任务状态-->
     <update id="updateById">
-        UPDATE  kq_cmd_task SET trans_status=#{transStatus}
+        UPDATE  kq_cmd_task SET trans_status=#{transStatus},trans_status_update_time=now()
                 <if test="msg!=null and msg!=''">
                     ,msg=#{msg}
                 </if>

bonus-modules/bonus-urk/src/main/resources/mapper/urk/UserFaceHandleMapper.xml

@@ -25,7 +25,7 @@
 
     <select id="getOnUserInfo" resultType="com.bonus.urk.vo.BmWorkerEinUserVo">
         select bwem.worker_id userId,bwem.pro_name proName,bwem.pro_id proId,pw.`name` userName,
-               bwem.team_name teamName,bwem.team_id teamId,pw.id_number,
+               bwem.team_name teamName,bwem.team_id teamId,pw.id_number idNumber,
                bwem.sub_id subId,bwem.sub_name subName,bwem.post_id postId,bwem.contract_id,bwc.day_rate dailyWage
         from bm_worker_ein_msg  bwem
              left join pm_worker pw on pw.id=bwem.worker_id