Merge remote-tracking branch 'origin/dev' into dev

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/digitalmans/domain/dto/DmSyncDigitalmanDto.java

@@ -2,11 +2,10 @@ package com.xueyi.system.api.digitalmans.domain.dto;
 
 import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanPo;
 import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanWorktimePo;
-import com.xueyi.system.api.digitalmans.domain.po.DmModelPo;
+import com.xueyi.system.api.organize.domain.vo.SysDeptExt;
 import com.xueyi.system.api.resource.domain.po.DmResourcesPo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 
@@ -21,6 +20,7 @@ public class DmSyncDigitalmanDto extends DmDigitalmanPo {
     protected DmResourcesPo icon;
     protected DmResourcesPo screenOff;
     protected DmDigitalmanWorktimePo worktime;
+    protected SysDeptExt workdayHour;
     protected String iconPos;
 
 }

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/digitalmans/domain/po/DmDigitalmanExtPo.java

@@ -26,16 +26,16 @@ public class DmDigitalmanExtPo extends TBaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 数字人id */
-    @Excel(name = "会议室ID")
+    @Excel(name = "数字人扩展表ID")
     protected Long id;
 
     /** 访客电话 */
-    @Excel(name = "访客电话")
+    @Excel(name = "snCode")
     protected String snCode;
 
 
     /** 技能信息 */
-    @Excel(name = "技能信息")
+    @Excel(name = "ip地址")
     protected String ipAddr;
 
     /** 访客公司 */

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/domain/vo/SysDeptExt.java → xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/organize/domain/vo/SysDeptExt.java

@@ -1,4 +1,4 @@
-package com.xueyi.system.organize.domain.vo;
+package com.xueyi.system.api.organize.domain.vo;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/manager/impl/DmDigitalmanManager.java

@@ -5,23 +5,26 @@ import com.xueyi.common.core.constant.basic.SqlConstants;
 import com.xueyi.common.web.entity.manager.impl.BaseManagerImpl;
 import com.xueyi.system.api.digitalmans.domain.dto.DmDigitalmanWorktimeDto;
 import com.xueyi.system.api.digitalmans.domain.dto.DmSyncDigitalmanDto;
-import com.xueyi.system.api.resource.domain.po.DmResourcesPo;
-import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanExtDto;
-import com.xueyi.system.digitalmans.domain.model.DmDigitalmanWorktimeConverter;
 import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanExtPo;
 import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanPo;
-import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanDto;
 import com.xueyi.system.api.digitalmans.domain.po.DmModelPo;
-import com.xueyi.system.digitalmans.domain.query.DmDigitalmanQuery;
+import com.xueyi.system.api.organize.domain.vo.SysDeptExt;
+import com.xueyi.system.api.resource.domain.po.DmResourcesPo;
+import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanDto;
 import com.xueyi.system.digitalmans.domain.model.DmDigitalmanConverter;
-import com.xueyi.system.digitalmans.mapper.*;
+import com.xueyi.system.digitalmans.domain.model.DmDigitalmanWorktimeConverter;
+import com.xueyi.system.digitalmans.domain.query.DmDigitalmanQuery;
 import com.xueyi.system.digitalmans.manager.IDmDigitalmanManager;
+import com.xueyi.system.digitalmans.mapper.DmDigitalmanExtMapper;
+import com.xueyi.system.digitalmans.mapper.DmDigitalmanMapper;
+import com.xueyi.system.digitalmans.mapper.DmDigitalmanWorktimeMapper;
+import com.xueyi.system.digitalmans.mapper.DmModelMapper;
+import com.xueyi.system.organize.mapper.SysDeptExtMapper;
 import com.xueyi.system.resource.mapper.DmResourcesMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 数字人基础管理 数据封装层处理
@@ -39,6 +42,9 @@ public class DmDigitalmanManager extends BaseManagerImpl<DmDigitalmanQuery, DmDi
     @Autowired
     DmResourcesMapper dmResourcesMapper;
 
+    @Autowired
+    SysDeptExtMapper sysDeptExtMapper;
+
     @Autowired
     DmDigitalmanWorktimeMapper digitalmanWorktimeMapper;
 
@@ -109,7 +115,13 @@ public class DmDigitalmanManager extends BaseManagerImpl<DmDigitalmanQuery, DmDi
     public DmSyncDigitalmanDto syncDigitalmanInfo(String manCode, String timestamp) {
         System.out.println("======syncDigitalmanInfo: manCode：" + manCode);
         DmDigitalmanPo dmpo = mapperPo(super.baseMapper.selectByCode(manCode));
+
+        DmDigitalmanExtPo extPo = digitalmanExtMapper.selectByManCode(manCode);
         DmSyncDigitalmanDto sdmdto = new DmSyncDigitalmanDto();
+        if (null != extPo && null != extPo.getDeptId()) {
+            SysDeptExt deptExt = sysDeptExtMapper.selectWorkTimeByDeptId(extPo.getDeptId());
+            sdmdto.setWorkdayHour(deptExt);//考勤时间
+        }
         sdmdto.setId(dmpo.getId());
         sdmdto.setManCode(dmpo.getManCode());
         sdmdto.setName(dmpo.getName());

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/mapper/DmDigitalmanExtMapper.java

@@ -1,12 +1,10 @@
 package com.xueyi.system.digitalmans.mapper;
 
 import com.xueyi.common.datasource.annotation.Isolate;
-import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanDto;
-import com.xueyi.system.digitalmans.domain.query.DmDigitalmanExtQuery;
-import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanExtDto;
-import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanExtPo;
 import com.xueyi.common.web.entity.mapper.BaseMapper;
-import com.xueyi.common.datasource.annotation.Master;
+import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanExtPo;
+import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanExtDto;
+import com.xueyi.system.digitalmans.domain.query.DmDigitalmanExtQuery;
 
 /**
  * 数字人扩展管理 数据层
@@ -16,5 +14,6 @@ import com.xueyi.common.datasource.annotation.Master;
 @Isolate
 public interface DmDigitalmanExtMapper extends BaseMapper<DmDigitalmanExtQuery, DmDigitalmanExtDto, DmDigitalmanExtPo> {
     public DmDigitalmanExtDto selectByManId(Long id);
+    public DmDigitalmanExtDto selectByManCode(String manCode);
 
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/controller/SysOrganizeController.java

@@ -6,10 +6,15 @@ import com.xueyi.common.security.annotation.Logical;
 import com.xueyi.common.security.annotation.RequiresPermissions;
 import com.xueyi.common.security.auth.Auth;
 import com.xueyi.common.web.entity.controller.BasisController;
-import com.xueyi.system.organize.domain.vo.SysDeptExt;
+import com.xueyi.system.api.organize.domain.vo.SysDeptExt;
 import com.xueyi.system.organize.service.ISysOrganizeService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 组织管理 业务处理

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/manager/ISysOrganizeManager.java

@@ -1,6 +1,6 @@
 package com.xueyi.system.organize.manager;
 
-import com.xueyi.system.organize.domain.vo.SysDeptExt;
+import com.xueyi.system.api.organize.domain.vo.SysDeptExt;
 import com.xueyi.system.organize.domain.vo.SysOrganizeTree;
 
 import java.util.Collection;

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/manager/impl/SysOrganizeManager.java

@@ -6,11 +6,11 @@ import com.xueyi.common.core.utils.core.ArrayUtil;
 import com.xueyi.common.core.utils.core.CollUtil;
 import com.xueyi.system.api.organize.domain.dto.SysDeptDto;
 import com.xueyi.system.api.organize.domain.dto.SysPostDto;
+import com.xueyi.system.api.organize.domain.vo.SysDeptExt;
 import com.xueyi.system.organize.domain.merge.SysOrganizeRoleMerge;
 import com.xueyi.system.organize.domain.merge.SysRoleDeptMerge;
 import com.xueyi.system.organize.domain.merge.SysRolePostMerge;
 import com.xueyi.system.organize.domain.merge.SysUserPostMerge;
-import com.xueyi.system.organize.domain.vo.SysDeptExt;
 import com.xueyi.system.organize.domain.vo.SysOrganizeTree;
 import com.xueyi.system.organize.manager.ISysDeptManager;
 import com.xueyi.system.organize.manager.ISysOrganizeManager;
@@ -23,7 +23,12 @@ import com.xueyi.system.organize.mapper.merge.SysUserPostMergeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/mapper/SysDeptExtMapper.java

@@ -2,11 +2,10 @@ package com.xueyi.system.organize.mapper;
 
 import com.xueyi.common.datasource.annotation.Isolate;
 import com.xueyi.common.web.entity.mapper.BaseMapper;
-import com.xueyi.common.web.entity.mapper.TreeMapper;
+import com.xueyi.system.api.organize.domain.vo.SysDeptExt;
 import com.xueyi.system.organize.domain.dto.SysDeptExtDto;
 import com.xueyi.system.organize.domain.po.SysDeptExtPo;
 import com.xueyi.system.organize.domain.query.SysDeptExtQuery;
-import com.xueyi.system.organize.domain.vo.SysDeptExt;
 import org.apache.ibatis.annotations.Param;
 
 /**

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/service/ISysOrganizeService.java

@@ -1,6 +1,6 @@
 package com.xueyi.system.organize.service;
 
-import com.xueyi.system.organize.domain.vo.SysDeptExt;
+import com.xueyi.system.api.organize.domain.vo.SysDeptExt;
 import com.xueyi.system.organize.domain.vo.SysOrganizeTree;
 
 import java.util.Collection;

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/service/impl/SysOrganizeServiceImpl.java

@@ -4,7 +4,7 @@ import com.xueyi.common.core.constant.system.OrganizeConstants;
 import com.xueyi.common.core.utils.TreeUtil;
 import com.xueyi.common.core.utils.core.CollUtil;
 import com.xueyi.common.core.utils.core.StrUtil;
-import com.xueyi.system.organize.domain.vo.SysDeptExt;
+import com.xueyi.system.api.organize.domain.vo.SysDeptExt;
 import com.xueyi.system.organize.domain.vo.SysOrganizeTree;
 import com.xueyi.system.organize.manager.impl.SysOrganizeManager;
 import com.xueyi.system.organize.service.ISysOrganizeService;

xueyi-modules/xueyi-system/src/main/resources/mapper/digitalmans/DmDigitalmanExtMapper.xml

@@ -8,4 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByManId" resultType="DmDigitalmanExtDto">
         select * from dm_man_ext where man_id = #{id}
     </select>
+
+    <select id="selectByManCode" resultType="DmDigitalmanExtDto">
+        select * from dm_man_ext where man_code = #{manCode}
+    </select>
 </mapper>