Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c1ccdf48 由 zshaohui
选项

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

2.工单统计时,按开工时间进行统计,不按工单创建时间
1 个父辈 a04c3173
内嵌 并排
正在显示 8 个修改的文件 包含 59 行增加 和 16 行删除
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
...@@ -88,7 +88,7 @@ public class DataInitManager { ...@@ -88,7 +88,7 @@ public class DataInitManager {
operator = roleManager.save(operator); operator = roleManager.save(operator);
log.info("创建默认角色：" + operator.toString()); 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); admin = userManager.save(admin);
log.info("创建默认用户：" + admin.toString()); log.info("创建默认用户：" + admin.toString());
......
src/main/java/com/neotel/smfcore/common/utils/UserCodeUtil.java
...@@ -107,7 +107,7 @@ public class UserCodeUtil { ...@@ -107,7 +107,7 @@ public class UserCodeUtil {
String langu=""; String langu="";
String roleId=""; String roleId="";
User user=new User(username,email,langu,roleId,"",true User user=new User(username,email,langu,roleId,"",true
,false,new Date(),new HashSet<>(),"",""); ,false,new Date(),new HashSet<>(),"","","");
user.setId(id); user.setId(id);
user.setCreateDate(createData); user.setCreateDate(createData);
list.add(user); list.add(user);
......
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -990,40 +990,47 @@ public class LiteOrderCache implements ITaskListener { ...@@ -990,40 +990,47 @@ public class LiteOrderCache implements ITaskListener {
if (progress == null) { if (progress == null) {
progress = new OrderProgress(); progress = new OrderProgress();
} }
Date orderCreateDate = order.getCreateDate(); Date orderStartDate = order.getStartDate();
String orderCreateDateStr = DateUtil.format(orderCreateDate, "yyyy-MM-dd"); String orderStartDateStr = DateUtil.format(orderStartDate, "yyyy-MM-dd");
Date createDate = progress.getCreateDate(); Date createDate = progress.getCreateDate();
String createDateStr = DateUtil.format(createDate, "yyyy-MM-dd"); 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; return;
} }
if (ShiftUtil.isA(orderCreateDate)) { if (ShiftUtil.isA(orderStartDate)) {
if (!orderCreateDateStr.equals(createDateStr)) { if (!orderStartDateStr.equals(createDateStr)) {
log.info("工单:"+order.getOrderNo()+"开工时间为:"+order.getStartDate()+"与缓存中时间:"+progress.getCreateDate()+"不一致");
progress = new OrderProgress(); progress = new OrderProgress();
} }
if (order.isNew()) { if (order.isNew()) {
log.info("工单:" + order.getOrderNo() + "属于白班新建,数量加1");
progress.setShiftAOrderCount(progress.getShiftAOrderCount() + 1); progress.setShiftAOrderCount(progress.getShiftAOrderCount() + 1);
} else if (order.isClosed()) { } else if (order.isClosed()) {
log.info("工单:" + order.getOrderNo() + "属于白班关闭,数量加1");
progress.setShiftAOrderFinishedCount(progress.getShiftAOrderFinishedCount() + 1); progress.setShiftAOrderFinishedCount(progress.getShiftAOrderFinishedCount() + 1);
} }
} else { } else {
Date startDate = ShiftUtil.getShiftBSelectDate(orderCreateDate); Date startDate = ShiftUtil.getShiftBSelectDate(orderStartDate);
String startDateStr = DateUtil.format(startDate, "yyyy-MM-dd"); String startDateStr = DateUtil.format(startDate, "yyyy-MM-dd");
if (!startDateStr.equals(createDateStr)) { if (!startDateStr.equals(createDateStr)) {
log.info("工单:"+order.getOrderNo()+"开工时间为:"+order.getStartDate()+"与缓存中时间:"+progress.getCreateDate()+"不一致");
progress = new OrderProgress(); progress = new OrderProgress();
} }
if (order.isNew()) { if (order.isNew()) {
log.info("工单:" + order.getOrderNo() + "属于夜班新建,数量加1");
progress.setShiftBOrderCount(progress.getShiftBOrderCount() + 1); progress.setShiftBOrderCount(progress.getShiftBOrderCount() + 1);
} else if (order.isClosed()) { } else if (order.isClosed()) {
log.info("工单:" + order.getOrderNo() + "属于夜班新建,数量加1");
progress.setShiftBOrderFinishedCount(progress.getShiftBOrderFinishedCount() + 1); progress.setShiftBOrderFinishedCount(progress.getShiftBOrderFinishedCount() + 1);
} }
} }
dataCache.updateCache(Constants.CACHE_OrderProgress, progress); dataCache.updateCache(Constants.CACHE_OrderProgress, progress);
} catch (Exception e) { } catch (Exception e) {
log.error("更新工单信息报错",e); log.error("更新工单信息报错", e);
e.printStackTrace(); e.printStackTrace();
} }
} }
......
src/main/java/com/neotel/smfcore/hikvision/HikvisionKanBanController.java
...@@ -73,18 +73,35 @@ public class HikvisionKanBanController { ...@@ -73,18 +73,35 @@ public class HikvisionKanBanController {
@ApiOperation("入库或者备料") @ApiOperation("入库或者备料")
@GetMapping("inOutDetail") @GetMapping("inOutDetail")
@ApiImplicitParams(value = { @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 @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(); InOutDetailInfo info = new InOutDetailInfo();
List<TaskCount> taskCountList = hikTaskCountManager.findTaskCountByDate(DateUtil.parse(date, "yyyy-MM-dd")); List<TaskCount> taskCountList = hikTaskCountManager.findTaskCountByDate(DateUtil.parse(date, "yyyy-MM-dd"));
if (taskCountList != null && !taskCountList.isEmpty()) { if (taskCountList != null && !taskCountList.isEmpty()) {
for (TaskCount taskCount : taskCountList) { for (TaskCount taskCount : taskCountList) {
if (ShiftUtil.SHIFT_A.equals(taskCount.getShift())) { 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())) { } 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; ...@@ -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.dao.IHikTaskCountDao;
import com.neotel.smfcore.hikvision.service.manager.IHikTaskCountManager; import com.neotel.smfcore.hikvision.service.manager.IHikTaskCountManager;
import com.neotel.smfcore.hikvision.util.ShiftUtil; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -20,6 +22,9 @@ public class HikTaskCountManagerImpl implements IHikTaskCountManager { ...@@ -20,6 +22,9 @@ public class HikTaskCountManagerImpl implements IHikTaskCountManager {
@Autowired @Autowired
private IHikTaskCountDao hikTaskCountDao; private IHikTaskCountDao hikTaskCountDao;
@Autowired
private IUserManager userManager;
@Override @Override
public void updateInOutCount(DataLog task) { public void updateInOutCount(DataLog task) {
if (task.isFinished()) { if (task.isFinished()) {
...@@ -56,6 +61,16 @@ public class HikTaskCountManagerImpl implements IHikTaskCountManager { ...@@ -56,6 +61,16 @@ public class HikTaskCountManagerImpl implements IHikTaskCountManager {
@Override @Override
public List<TaskCount> findTaskCountByDate(Date date) { 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 { ...@@ -55,5 +55,6 @@ public class UserDto implements Serializable {
@ApiModelProperty("当前正在操作的工单号") @ApiModelProperty("当前正在操作的工单号")
private String currOrderNo; 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 { ...@@ -100,6 +100,7 @@ public class UserManagerImpl implements IUserManager {
dataUser.setGroups(user.getGroups()); dataUser.setGroups(user.getGroups());
dataUser.setLanguage(user.getLanguage()); dataUser.setLanguage(user.getLanguage());
dataUser.setPwdResetTime(user.getPwdResetTime()); dataUser.setPwdResetTime(user.getPwdResetTime());
dataUser.setOtherName(user.getOtherName());
userDao.save(dataUser); userDao.save(dataUser);
} }
} }
...@@ -114,7 +115,7 @@ public class UserManagerImpl implements IUserManager { ...@@ -114,7 +115,7 @@ public class UserManagerImpl implements IUserManager {
//只能修改邮箱和语言 //只能修改邮箱和语言
dataUser.setEmail(resources.getEmail()); dataUser.setEmail(resources.getEmail());
dataUser.setLanguage(resources.getLanguage()); dataUser.setLanguage(resources.getLanguage());
dataUser.setOtherName(resources.getOtherName());
} }
userDao.save(dataUser); 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 { ...@@ -62,6 +62,8 @@ public class User extends BasePo implements Serializable {
*/ */
private String currOrderNo; private String currOrderNo;
private String otherName;
public boolean hasGroup(String groupId) { public boolean hasGroup(String groupId) {
if (groupId == null || groupId.equals("") || groupId.equals("-1")) { if (groupId == null || groupId.equals("") || groupId.equals("-1")) {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!