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

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/organize/domain/dto/SysUserDto.java

@@ -59,4 +59,12 @@ public class SysUserDto extends SysUserPo {
         return StrUtil.equals(AuthorityConstants.UserType.ADMIN.getCode(), userType);
     }
 
+    @Override
+    public String toString(){
+        return "User{" +
+                "id=" + id +
+                ", username='" + userName + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", phone='" + phone + '\'';
+    }
 }

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/organize/domain/po/SysUserPo.java

@@ -95,4 +95,12 @@ public class SysUserPo extends TBaseEntity {
     protected LocalDateTime loginDate;
 
     protected String dept;
+    @Override
+    public String toString(){
+        return "User{" +
+                "id=" + id +
+                ", username='" + userName + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", phone='" + phone + '\'';
+    }
 }

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/domain/dto/DmStaffCommonDto.java

@@ -11,6 +11,7 @@ import lombok.Data;
 public class DmStaffCommonDto {
 
     public static final String TYPE_STRANGER = "6";
+    public static final String TYPE_VIP_STRANGER = "9";
     private String staffName;
 
     protected String staffType;

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmBroadcastController.java

@@ -12,6 +12,7 @@ import com.xueyi.common.security.annotation.Logical;
 import com.xueyi.common.security.annotation.RequiresPermissions;
 import com.xueyi.common.web.entity.controller.BaseController;
 import com.xueyi.system.api.digitalmans.domain.vo.DmBroadcastVo;
+import com.xueyi.system.api.organize.domain.po.SysUserPo;
 import com.xueyi.system.digitalmans.domain.dto.DmBroadcastDto;
 import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanDto;
 import com.xueyi.system.digitalmans.domain.merge.DmBroadcastResourceMerge;
@@ -20,6 +21,7 @@ import com.xueyi.system.digitalmans.domain.query.DmDigitalmanQuery;
 import com.xueyi.system.digitalmans.manager.impl.DmBroadcastManager;
 import com.xueyi.system.digitalmans.service.IDmBroadcastService;
 import com.xueyi.system.digitalmans.service.IDmDigitalmanService;
+import com.xueyi.system.organize.service.ISysUserService;
 import com.xueyi.system.resource.domain.dto.DmResourcesDto;
 import com.xueyi.system.resource.domain.model.DmResourcesConverter;
 import com.xueyi.system.resource.mapper.DmResourcesMapper;
@@ -28,6 +30,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -57,6 +60,9 @@ public class DmBroadcastController extends BaseController<DmBroadcastQuery, DmBr
     @Autowired
     private IDmDigitalmanService digitalmanService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询播报列表
      */
@@ -107,6 +113,8 @@ public class DmBroadcastController extends BaseController<DmBroadcastQuery, DmBr
 
         for (DmBroadcastDto dto : list) {
             List<DmBroadcastResourceMerge> mergeDtos = broadcastManager.selectBroadcastResourceMerge(dto.getId());
+            SysUserPo user = sysUserService.selectById(dto.getCreateBy());
+            dto.setUserName(user.getUserName());
             List<JSONObject> temp = new ArrayList<>();
             for (DmBroadcastResourceMerge merge : mergeDtos) {
                 if (merge.getResourceId() != null && merge.getResourceId() > 0) {
@@ -116,6 +124,8 @@ public class DmBroadcastController extends BaseController<DmBroadcastQuery, DmBr
                     temp.add(json);
                 }
             }
+
+
             dto.setObjList(temp);
         }
         return getDataTable(list);
@@ -141,6 +151,7 @@ public class DmBroadcastController extends BaseController<DmBroadcastQuery, DmBr
     public AjaxResult add(@Validated({V_A.class}) @RequestBody DmBroadcastDto broadcast) {
         Long id = IdUtil.getSnowflakeNextId();
         broadcast.setId(id);
+        broadcast.setCreateTime(LocalDateTime.now());
         broadcastManager.addBroadcastResourceMerge(id,  broadcast.getResourceList());
         return super.add(broadcast);
     }
@@ -154,6 +165,7 @@ public class DmBroadcastController extends BaseController<DmBroadcastQuery, DmBr
     @Log(title = "播报管理", businessType = BusinessType.UPDATE)
     public AjaxResult edit(@Validated({V_E.class}) @RequestBody DmBroadcastDto broadcast) {
         broadcastManager.editBroadcastResourceMerge(broadcast.getId(), broadcast.getResourceList());
+        broadcast.setUpdateTime(LocalDateTime.now());
         return super.edit(broadcast);
     }
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/domain/dto/DmBroadcastDto.java

@@ -25,4 +25,6 @@ public class DmBroadcastDto extends DmBroadcastPo {
 
     private List<JSONObject>  objList;
 
+    private String userName;
+
 }

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

@@ -60,8 +60,11 @@ public class DmBroadcastManager extends BaseManagerImpl<DmBroadcastQuery, DmBroa
                 .map(DmBroadcastResourceMerge::getId)
                 .collect(Collectors.toList());
 
+
         idList.removeAll(newList);
-        broadcastResourceMergeMapper.deleteBatchIds(idList);
+        if (idList.size() > 0) {
+            broadcastResourceMergeMapper.deleteBatchIds(idList);
+        }
 
         if (broadcastResourceMerges.size() > 0) {
             broadcastResourceMergeMapper.updateBatch(broadcastResourceMerges);
@@ -71,7 +74,8 @@ public class DmBroadcastManager extends BaseManagerImpl<DmBroadcastQuery, DmBroa
     @Override
     public List<DmBroadcastResourceMerge> selectBroadcastResourceMerge(Long broadcastId) {
         List<DmBroadcastResourceMerge> merges = broadcastResourceMergeMapper.selectList(Wrappers.<DmBroadcastResourceMerge>query().lambda()
-                .eq(DmBroadcastResourceMerge::getBroadcastId, broadcastId));
+                .eq(DmBroadcastResourceMerge::getBroadcastId, broadcastId)
+                .orderByAsc(DmBroadcastResourceMerge::getId));
 
         return merges;
     }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmStaffInnerApiController.java

@@ -74,13 +74,14 @@ public class DmStaffInnerApiController extends BaseApiController {
     @ResponseBody
     public com.alibaba.fastjson2.JSONObject newStaff(@RequestBody DmStaffCommonDto commonDto){
         //访客
-        if (commonDto.getStaffType().equals(DmStaffCommonDto.TYPE_STRANGER)) {
+        if (commonDto.getStaffType().equals(DmStaffCommonDto.TYPE_STRANGER) || commonDto.getStaffType().equals(DmStaffCommonDto.TYPE_VIP_STRANGER)) {
 
             DmVisitorsPo v = new DmVisitorsPo();
             v.setName(commonDto.getStaffName());
             v.setNickname(commonDto.getStaffName());
             v.setType(DmVisitorsDto.TYPE_NORMAL_VISITOR);
             v.setGender(commonDto.getGender());
+            v.setType(Long.parseLong(commonDto.getStaffType()));
 
             //兼容熟人介绍生人，传递访客照片
             if (StringUtils.isNotEmpty(commonDto.getStaffBase64Img())) {