App详情页面 机构名称增加地区+行社

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskRecPageVo.java

@@ -1,23 +1,15 @@
 package com.xunmei.common.core.domain.drill.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.xunmei.common.core.domain.drill.domain.CoreDrillTaskToRole;
-import com.xunmei.common.core.domain.drill.domain.CoreDrillTaskToUser;
-import com.xunmei.common.core.web.domain.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.List;
 
 @Data
 public class CoreDrillTaskRecPageVo {
 
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
+    private Long orgId;
 
     @ApiModelProperty(value = "机构名称")
     private String orgName;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillTaskRecTaskPageVo.java

@@ -12,6 +12,7 @@ public class CoreDrillTaskRecTaskPageVo {
 
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
+    private Long orgId;
 
     @ApiModelProperty(value = "机构名称")
     private String orgName;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -221,6 +221,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         record.setTypeText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_TYPE, record.getType()));
         //处理演练任务推荐状态字典
         record.setRecStatusText(DictUtils.getDictLabel(DictConstants.DRILL_TASK_REC_STATUS, record.getRecStatus()));
+        if (SecurityUtils.isApp()){
+            record.setOrgName(orgService.concatOrgName(record.getOrgId(),SecurityConstants.INNER));
+        }
     }
 
     @Override
@@ -254,6 +257,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         detailVo.setTypeText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_TYPE, detailVo.getType()));
         detailVo.setRecStatusText(DictUtils.getDictLabel(DictConstants.DRILL_TASK_REC_STATUS, detailVo.getRecStatus()));
         detailVo.setCategoryText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY, detailVo.getCategory()));
+        detailVo.setOrgName(orgService.concatOrgName(detailVo.getOrgId(), SecurityConstants.INNER));
         return detailVo;
     }
 
@@ -351,8 +355,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         return coreDrillTaskMapper.updateById(coreDrillTask);
     }
 
-    private void dealHost(String hostName,CoreDrillTask coreDrillTask) {
-        if (ObjectUtil.isNotEmpty(hostName)){
+    private void dealHost(String hostName, CoreDrillTask coreDrillTask) {
+        if (ObjectUtil.isNotEmpty(hostName)) {
             coreDrillTask.setHostName(hostName);
             return;
         }
@@ -984,6 +988,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     @Override
     public TableDataInfo<CoreDrillTaskRecPageVo> recList(CoreDrillTaskRecPageDto request) {
         dealRecListParam(request);
+
         IPage<CoreDrillTaskRecPageVo> page = coreDrillTaskMapper.selectRecPage(request.getPageRequest(), request);
         for (CoreDrillTaskRecPageVo record : page.getRecords()) {
             //处理演练任务类型字典
@@ -999,6 +1004,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 //处理演练任务推荐状态字典
                 record.setRecStatusText(DictUtils.getDictLabel(DictConstants.DRILL_TASK_REC_STATUS, record.getRecStatus()));
             }
+            record.setOrgName(orgService.concatOrgName(record.getOrgId(),SecurityConstants.INNER));
 
 
         }
@@ -1023,6 +1029,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         for (CoreDrillTaskRecTaskPageVo record : records) {
             //处理演练任务类型字典
             record.setTypeText(DictUtils.getDictLabel(DictConstants.CORE_DRILL_TYPE, record.getType()));
+            record.setOrgName(orgService.concatOrgName(record.getOrgId(),SecurityConstants.INNER));
         }
         return TableDataInfo.build(page);
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -133,7 +133,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             Map<Long, List<CoreEduTrainingTaskToRole>> listMap = roleList.stream().collect(Collectors.groupingBy(CoreEduTrainingTaskToRole::getEduTrainingTaskId));*/
             final List<CoreEduTrainingTaskPageVo> records = pageData.getRecords();
             for (CoreEduTrainingTaskPageVo record : records) {
-                dealData(record, records, null);
+                dealData(record, records);
             }
             //App的排序逻辑已在SQL中实现,如果不是App的查询,那么就走Web的排序逻辑
             if (ObjectUtil.notEqual(1, request.getIsAppSelect())) {
@@ -196,7 +196,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         });*/
     }
 
-    private void dealData(CoreEduTrainingTaskPageVo record, List<CoreEduTrainingTaskPageVo> records, Map<Long, List<CoreEduTrainingTaskToRole>> listMap) {
+    private void dealData(CoreEduTrainingTaskPageVo record, List<CoreEduTrainingTaskPageVo> records) {
         record.setNo(records.indexOf(record) + 1);
         record.setTypeText(EduTrainingType.getName(record.getType()));
         record.setStatusText(EduTrainingDoStatus.getName(record.getStatus()));
@@ -213,6 +213,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         int totalNums = (int) userList.stream().filter(user -> ObjectUtil.equal(user.getType(), 1)).count();
         record.setSignNums(signNums + "/" + totalNums);
         record.setUserList(userList);
+        if (SecurityUtils.isApp()){
+            record.setOrgName(orgService.concatOrgName(record.getOrgId(),SecurityConstants.INNER));
+        }
 
     }
 
@@ -244,6 +247,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             detailVo.setAbsenceList(collect.get(1));
             detailVo.setAbsentList(collect.get(2));
         }
+        if (SecurityUtils.isApp()){
+            detailVo.setOrgName(orgService.concatOrgName(detailVo.getOrgId(),SecurityConstants.INNER));
+        }
         return detailVo;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -283,6 +283,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         }
 
         TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, beCheckedOrg, roleNames, getInRegisterTime(task.getPlanStartTime(), task.getPlanEndTime()));
+        vo.setBeCheckedOrgName(remoteOrgService.concatOrgName(beCheckedOrg.getId(),SecurityConstants.INNER));
         if (ObjectUtil.isNotNull(plan)) {
             vo.setPlanType(plan.getCheckType().intValue());
         }

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -221,7 +221,7 @@
     </sql>
 
     <select id="selectRecTaskListPage" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskRecTaskPageVo">
-        select id,org_name,drill_start_time,drill_end_time,type from core_drill_task t
+        select id,org_id,org_name,drill_start_time,drill_end_time,type from core_drill_task t
         where drill_start_time is not null
         <include refid="recTaskListPage"/>
         <if test="request.startTime != null and request.endTime != null">

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotCommonSensorServiceImpl.java

@@ -18,6 +18,7 @@ import com.xunmei.common.core.utils.bean.BeanUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.common.security.utils.DictUtils;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.iot.dto.sensor.SensorAppPageDto;
 import com.xunmei.iot.dto.sensor.SensorPageDto;
 import com.xunmei.iot.mapper.IotCommonSensorMapper;
@@ -131,6 +132,9 @@ public class IotCommonSensorServiceImpl extends ServiceImpl<IotCommonSensorMappe
             record.setInfo(dealInfoData(info));
             record.setDeviceType(DictUtils.getDictLabel(DictConstants.APP_SENSOR_DEVICE_TYPE, Integer.parseInt(record.getDeviceType())));
             record.setStateText(DictUtils.getDictLabel(DictConstants.SENSOR_ALARM_STATUS, record.getState()));
+            if (SecurityUtils.isApp()){
+                record.setOrgName(orgService.concatOrgName(record.getOrgId(),SecurityConstants.INNER));
+            }
         }
 
         return TableDataInfo.build(page);
@@ -156,7 +160,7 @@ public class IotCommonSensorServiceImpl extends ServiceImpl<IotCommonSensorMappe
         BeanUtils.copyProperties(sensor, vo);
         vo.setDeviceTypeText(DictUtils.getDictLabel(DictConstants.APP_SENSOR_DEVICE_TYPE, Integer.parseInt(vo.getDeviceType())));
         vo.setStateText(DictUtils.getDictLabel(DictConstants.SENSOR_ALARM_STATUS, vo.getState()));
-
+        vo.setOrgName(orgService.concatOrgName(sensor.getOrgId(),SecurityConstants.INNER));
         return vo;
     }
 

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotDvrDiskServiceImpl.java

@@ -4,15 +4,14 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotDvrDisk;
-import com.xunmei.common.core.domain.iot.domain.IotSensor;
 import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAlarmHistoryPageDto;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskAppPageDto;
 import com.xunmei.iot.dto.dvrDisk.DvrDiskPageDto;
@@ -124,6 +123,9 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
             } else {
                 r.setState(2);
             }
+            if (SecurityUtils.isApp()){
+                r.setOrgName(orgService.concatOrgName(r.getOrgId(),SecurityConstants.INNER));
+            }
         });
         return TableDataInfo.success(page);
     }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/VideoDiagnosisServiceImpl.java

@@ -14,6 +14,7 @@ import com.xunmei.common.core.domain.video.MediatorVideoIntegrityCheckLog;
 import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.common.core.enums.iot.VideoIntegrityStatus;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.iot.dto.videoDiagnosis.VideoDiagnosisAppPageDto;
 import com.xunmei.iot.dto.videoDiagnosis.VideoDiagnosisWebPageDto;
 import com.xunmei.iot.mapper.IotDvrChannelMapper;
@@ -108,6 +109,9 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
             } else {
                 r.setState(0);
             }
+            if (SecurityUtils.isApp()){
+                r.setOrgName(orgService.concatOrgName(r.getOrgId(),SecurityConstants.INNER));
+            }
         });
         return TableDataInfo.success(page);
     }
@@ -134,6 +138,9 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
             } else {
                 r.setState(0);
             }
+            if (SecurityUtils.isApp()){
+                r.setOrgName(orgService.concatOrgName(r.getOrgId(),SecurityConstants.INNER));
+            }
         });
         return TableDataInfo.success(page);
     }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/dvrDisk/DvrDiskAppPageVo.java

@@ -1,6 +1,5 @@
 package com.xunmei.iot.vo.dvrDisk;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xunmei.common.core.domain.iot.domain.IotDvrDisk;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,6 +8,10 @@ import java.util.List;
 
 @Data
 public class DvrDiskAppPageVo {
+
+    @ApiModelProperty("所属机构id")
+    private Long orgId;
+
     @ApiModelProperty("所属机构")
     private String orgName;
 

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/sensor/SensorAppPageVo.java

@@ -15,6 +15,7 @@ import java.time.LocalDateTime;
 public class SensorAppPageVo {
 
     private Long id;
+    private Long orgId;
 
     @ApiModelProperty("设备名称")
     private String deviceName;

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/videoDiagnosis/VideoDiagnosisAppPageVo.java

@@ -1,6 +1,5 @@
 package com.xunmei.iot.vo.videoDiagnosis;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.util.List;
@@ -14,6 +13,7 @@ public class VideoDiagnosisAppPageVo {
     private String orgName;
 
     private  Integer state;
+    private  Long orgId;
 
     private List<VideoDiagnosisAppPageChannelVo> channels;
 }

soc-modules/soc-modules-iot/src/main/resources/mapper/DvrDiskMapper.xml

@@ -31,6 +31,7 @@
         <result column="equipmentName" property="equipmentName"/>
         <result column="check_time" property="stateUpdateTime"/>
         <result column="orgName" property="orgName"/>
+        <result column="orgId" property="orgId"/>
         <result column="state" property="state"/>
         <collection property="diskInfos" column="equipmentCode=equipmentCode,state=state"
                     select="selectDiskInfo">
@@ -166,7 +167,7 @@
     </select>
     <select id="selectAppHostPage" resultMap="selectAppHostPageMap">
         SELECT
-        d.id,
+        d.id,d.org_id as orgId,
         d.equipment_code AS equipmentCode,
         d.equipment_name AS equipmentName,
         d.org_name AS orgName,

soc-modules/soc-modules-iot/src/main/resources/mapper/IotDvrChannelMapper.xml

@@ -49,6 +49,7 @@
         <result column="equipment_code" property="hostCode"></result>
         <result column="equipment_name" property="hostName"></result>
         <result column="org_name" property="orgName"></result>
+        <result column="org_id" property="orgId"></result>
         <result column="state" property="state"></result>
         <collection property="channels" ofType="com.xunmei.iot.vo.videoDiagnosis.VideoDiagnosisAppPageChannelVo"
                     column="equipmentCode=equipment_code,state=state"
@@ -277,7 +278,7 @@
     <select id="selectAppVideoCheckPage" resultMap="appVideoCheckPageMap">
         SELECT equipment_code,
         equipment_name,
-        org_name,
+        org_name,org_id,
         #{pageDto.state} as state
         from iot_device
         WHERE category_id = #{pageDto.categoryId}

soc-modules/soc-modules-iot/src/main/resources/mapper/IotSensorMapper.xml

@@ -28,7 +28,7 @@
         </if>
     </select>
     <select id="selectAppPageData" resultType="com.xunmei.iot.vo.sensor.SensorAppPageVo">
-        select s.id,org_name, device_name, device_type, infos as info,device_code, state_update_time ,state
+        select s.id,org_name,org_id, device_name, device_type, infos as info,device_code, state_update_time ,state
         from iot_sensor s
         where s.deleted=0
         <if test="request.orgId!= null">

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysNfcBindServiceImpl.java

@@ -1,37 +1,30 @@
 package com.xunmei.system.service.impl;
 
-import java.util.ArrayList;
-
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
-import com.xunmei.common.core.utils.bean.BeanUtils;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.domain.SysAreaCheck;
-
+import com.xunmei.system.domain.SysNfcBind;
 import com.xunmei.system.dto.SysNfcBindDTO;
+import com.xunmei.system.mapper.SysNfcBindMapper;
 import com.xunmei.system.service.ISysAreaCheckService;
 import com.xunmei.system.service.ISysAreaService;
 import com.xunmei.system.service.ISysNfcBindService;
-
+import com.xunmei.system.service.ISysOrgService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xunmei.system.service.ISysOrgService;
-
-import java.util.Arrays;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.SysNfcBindMapper;
-import com.xunmei.system.domain.SysNfcBind;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 
 /**
  * 【请填写功能名称】Service业务层处理
@@ -99,7 +92,11 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
             return new SysNfcBind();
         }
 
-        return sysNfcBindMapper.selectSysNfcBindByCode(code);
+        SysNfcBind sysNfcBind = sysNfcBindMapper.selectSysNfcBindByCode(code);
+        if (SecurityUtils.isApp()&&sysNfcBind!=null){
+            sysNfcBind.setOrgName(sysOrgService.concatOrgName(sysNfcBind.getOrgId()));
+        }
+        return sysNfcBind;
     }
 
     @Override

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -1453,6 +1453,6 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         if (ObjectUtil.isEmpty(org)){
             return StringUtil.EMPTY_STRING;
         }
-        return org.getAffiliatedArea()+"_"+org.getAffiliatedBank()+"_"+org.getShortName();
+        return org.getAffiliatedArea()+"-"+org.getAffiliatedBank()+"-"+org.getShortName();
     }
 }