1.用户管理增加别名,实时展示在看板上

2.工单统计时,按开工时间进行统计,不按工单创建时间

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -88,7 +88,7 @@ public class DataInitManager {
                 operator = roleManager.save(operator);
                 log.info("创建默认角色：" + operator.toString());
 
-                admin = new User(userName, "admin@qq.com", "zh-CN", role.getId(),"$2a$10$Egp1/gvFlt7zhlXVfEFw4OfWQCGPw0ClmMcc6FjTnvXNRVf9zdMRa", true, true, new Date(), groupIds, "","");
+                admin = new User(userName, "admin@qq.com", "zh-CN", role.getId(),"$2a$10$Egp1/gvFlt7zhlXVfEFw4OfWQCGPw0ClmMcc6FjTnvXNRVf9zdMRa", true, true, new Date(), groupIds, "","","admin");
                 admin = userManager.save(admin);
                 log.info("创建默认用户：" + admin.toString());
 

src/main/java/com/neotel/smfcore/common/utils/UserCodeUtil.java

@@ -107,7 +107,7 @@ public class UserCodeUtil {
             String langu="";
             String roleId="";
             User user=new User(username,email,langu,roleId,"",true
-            ,false,new Date(),new HashSet<>(),"","");
+            ,false,new Date(),new HashSet<>(),"","","");
             user.setId(id);
             user.setCreateDate(createData);
             list.add(user);

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -990,40 +990,47 @@ public class LiteOrderCache implements ITaskListener {
             if (progress == null) {
                 progress = new OrderProgress();
             }
-            Date orderCreateDate = order.getCreateDate();
-            String orderCreateDateStr = DateUtil.format(orderCreateDate, "yyyy-MM-dd");
+            Date orderStartDate = order.getStartDate();
+            String orderStartDateStr = DateUtil.format(orderStartDate, "yyyy-MM-dd");
 
             Date createDate = progress.getCreateDate();
             String createDateStr = DateUtil.format(createDate, "yyyy-MM-dd");
 
+            log.info("工单:" + order.getOrderNo() + "开工时间为:" + order.getStartDate() + "状态为:" + order.getStatus());
             //判断工单创建时间是否小于当前时间
-            if (DateUtil.parse(orderCreateDateStr, "yyyy-MM-dd").getTime() < DateUtil.parse(createDateStr, "yyyy-MM-dd").getTime()) {
+            if (DateUtil.parse(orderStartDateStr, "yyyy-MM-dd").getTime() < DateUtil.parse(createDateStr, "yyyy-MM-dd").getTime()) {
                 return;
             }
-            if (ShiftUtil.isA(orderCreateDate)) {
-                if (!orderCreateDateStr.equals(createDateStr)) {
+            if (ShiftUtil.isA(orderStartDate)) {
+                if (!orderStartDateStr.equals(createDateStr)) {
+                    log.info("工单:"+order.getOrderNo()+"开工时间为:"+order.getStartDate()+"与缓存中时间:"+progress.getCreateDate()+"不一致");
                     progress = new OrderProgress();
                 }
                 if (order.isNew()) {
+                    log.info("工单:" + order.getOrderNo() + "属于白班新建,数量加1");
                     progress.setShiftAOrderCount(progress.getShiftAOrderCount() + 1);
                 } else if (order.isClosed()) {
+                    log.info("工单:" + order.getOrderNo() + "属于白班关闭,数量加1");
                     progress.setShiftAOrderFinishedCount(progress.getShiftAOrderFinishedCount() + 1);
                 }
             } else {
-                Date startDate = ShiftUtil.getShiftBSelectDate(orderCreateDate);
+                Date startDate = ShiftUtil.getShiftBSelectDate(orderStartDate);
                 String startDateStr = DateUtil.format(startDate, "yyyy-MM-dd");
                 if (!startDateStr.equals(createDateStr)) {
+                    log.info("工单:"+order.getOrderNo()+"开工时间为:"+order.getStartDate()+"与缓存中时间:"+progress.getCreateDate()+"不一致");
                     progress = new OrderProgress();
                 }
                 if (order.isNew()) {
+                    log.info("工单:" + order.getOrderNo() + "属于夜班新建,数量加1");
                     progress.setShiftBOrderCount(progress.getShiftBOrderCount() + 1);
                 } else if (order.isClosed()) {
+                    log.info("工单:" + order.getOrderNo() + "属于夜班新建,数量加1");
                     progress.setShiftBOrderFinishedCount(progress.getShiftBOrderFinishedCount() + 1);
                 }
             }
             dataCache.updateCache(Constants.CACHE_OrderProgress, progress);
         } catch (Exception e) {
-            log.error("更新工单信息报错",e);
+            log.error("更新工单信息报错", e);
             e.printStackTrace();
         }
     }

src/main/java/com/neotel/smfcore/hikvision/HikvisionKanBanController.java

@@ -73,18 +73,35 @@ public class HikvisionKanBanController {
     @ApiOperation("入库或者备料")
     @GetMapping("inOutDetail")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "date", value = "日期,格式为yyyy-MM-dd", dataType = "String", required = true)
+            @ApiImplicitParam(name = "date", value = "日期,格式为yyyy-MM-dd", dataType = "String", required = true),
+            @ApiImplicitParam(name = "type", value = "1:是入库 2是:出库", dataType = "String", required = true)
     })
     @AnonymousAccess
-    public ResultBean<InOutDetailInfo> inOutDetail(@RequestParam(value = "date") String date) {
+    public ResultBean<InOutDetailInfo> inOutDetail(@RequestParam(value = "date") String date, @RequestParam(value = "type") String type) {
         InOutDetailInfo info = new InOutDetailInfo();
         List<TaskCount> taskCountList = hikTaskCountManager.findTaskCountByDate(DateUtil.parse(date, "yyyy-MM-dd"));
         if (taskCountList != null && !taskCountList.isEmpty()) {
             for (TaskCount taskCount : taskCountList) {
                 if (ShiftUtil.SHIFT_A.equals(taskCount.getShift())) {
-                    info.setShiftAList(taskCount);
+                    if ("1".equals(type)) {
+                        if (taskCount.getPutInCount() > 0) {
+                            info.setShiftAList(taskCount);
+                        }
+                    } else if ("2".equals(type)) {
+                        if (taskCount.getCheckOutCount() > 0) {
+                            info.setShiftAList(taskCount);
+                        }
+                    }
                 } else if (ShiftUtil.SHIFT_B.equals(taskCount.getShift())) {
-                    info.setShiftBList(taskCount);
+                    if ("1".equals(type)) {
+                        if (taskCount.getPutInCount() > 0) {
+                            info.setShiftBList(taskCount);
+                        }
+                    } else if ("2".equals(type)) {
+                        if (taskCount.getCheckOutCount() > 0) {
+                            info.setShiftBList(taskCount);
+                        }
+                    }
                 }
             }
         }

src/main/java/com/neotel/smfcore/hikvision/service/manager/impl/HikTaskCountManagerImpl.java

@@ -6,6 +6,8 @@ import com.neotel.smfcore.hikvision.service.po.TaskCount;
 import com.neotel.smfcore.hikvision.service.dao.IHikTaskCountDao;
 import com.neotel.smfcore.hikvision.service.manager.IHikTaskCountManager;
 import com.neotel.smfcore.hikvision.util.ShiftUtil;
+import com.neotel.smfcore.security.service.manager.IUserManager;
+import com.neotel.smfcore.security.service.po.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,6 +22,9 @@ public class HikTaskCountManagerImpl implements IHikTaskCountManager {
     @Autowired
     private IHikTaskCountDao hikTaskCountDao;
 
+    @Autowired
+    private IUserManager userManager;
+
     @Override
     public void updateInOutCount(DataLog task) {
         if (task.isFinished()) {
@@ -56,6 +61,16 @@ public class HikTaskCountManagerImpl implements IHikTaskCountManager {
 
     @Override
     public List<TaskCount> findTaskCountByDate(Date date) {
-        return hikTaskCountDao.findTaskCountByDate(date);
+        List<TaskCount> taskCountList = hikTaskCountDao.findTaskCountByDate(date);
+        if (taskCountList != null && !taskCountList.isEmpty()) {
+            for (TaskCount taskCount : taskCountList) {
+                String name = taskCount.getName();
+                User user = userManager.findByUserName(name);
+                if (user != null && StringUtils.isNotBlank(user.getOtherName())) {
+                    taskCount.setName(user.getOtherName());
+                }
+            }
+        }
+        return taskCountList;
     }
 }

src/main/java/com/neotel/smfcore/security/rest/bean/dto/UserDto.java

@@ -55,5 +55,6 @@ public class UserDto implements Serializable {
     @ApiModelProperty("当前正在操作的工单号")
     private String currOrderNo;
 
-
+    @ApiModelProperty("别名")
+    private String otherName;
 }

src/main/java/com/neotel/smfcore/security/service/manager/impl/UserManagerImpl.java

@@ -100,6 +100,7 @@ public class UserManagerImpl implements IUserManager {
             dataUser.setGroups(user.getGroups());
             dataUser.setLanguage(user.getLanguage());
             dataUser.setPwdResetTime(user.getPwdResetTime());
+            dataUser.setOtherName(user.getOtherName());
             userDao.save(dataUser);
         }
     }
@@ -114,7 +115,7 @@ public class UserManagerImpl implements IUserManager {
             //只能修改邮箱和语言
             dataUser.setEmail(resources.getEmail());
             dataUser.setLanguage(resources.getLanguage());
-
+            dataUser.setOtherName(resources.getOtherName());
         }
         userDao.save(dataUser);
     }

src/main/java/com/neotel/smfcore/security/service/po/User.java

@@ -62,6 +62,8 @@ public class User extends BasePo implements Serializable {
      */
     private String currOrderNo;
 
+    private String otherName;
+
     public boolean hasGroup(String groupId) {
 
         if (groupId == null || groupId.equals("") || groupId.equals("-1")) {