Merge branch 'V0.0.7' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.7

project_data/sql/0.0.7/soc/soc.sql

@@ -143,6 +143,17 @@ CREATE PROCEDURE schema_change () BEGIN
     END IF;
 
 
+    -- iot告警规则表增加字段：是否需要短信提醒告警
+    IF NOT EXISTS (
+            SELECT * FROM INFORMATION_SCHEMA.COLUMNS
+            WHERE table_schema = DATABASE ()
+              AND TABLE_NAME = 'iot_alarm_rule_express'
+              AND COLUMN_NAME = 'sms_type' )
+    THEN
+        alter table iot_alarm_rule_express
+            add sms_type int default 0 null comment '是否需要发送短信：0不需要，1需要' after end_time;
+    END IF;
+
 
 
 END ??

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteDictDataService.java

@@ -27,4 +27,13 @@ public interface RemoteDictDataService
      */
     @GetMapping(value = "/dict/data/bytype/{dictType}")
      public List<SysDictData> selectDictByeType(@PathVariable("dictType") String dictType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     *  查询指定类型的字典值 包括被删除的 被禁用的
+     * @param dictType
+     * @param source
+     * @return
+     */
+    @GetMapping(value = "/dict/data/fromDB/{dictType}")
+    public List<SysDictData> selectAllDictByeTypeFormDB(@PathVariable("dictType") String dictType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDictDataFallbackFactory.java

@@ -28,6 +28,11 @@ public class RemoteDictDataFallbackFactory implements FallbackFactory<RemoteDict
             public List<SysDictData> selectDictByeType(String dictType, String source) {
                 return new ArrayList<>();
             }
+
+            @Override
+            public List<SysDictData> selectAllDictByeTypeFormDB(String dictType, String source) {
+                return new ArrayList<>();
+            }
         };
     }
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/panel/vo/PanelListVo.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class PanelListVo {
@@ -40,5 +41,9 @@ public class PanelListVo {
     @ApiModelProperty(value = "是否存在监控",notes = "0不存在1存在")
     private Integer isExist;
 
+    @ApiModelProperty(value = "同名任务分组",notes = "仅安全检查使用该字段")
+    private List<PanelListVo> uncompleted;
 
+    @ApiModelProperty(value = "面板功能名称")
+    private String beCheckedOrgName;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskMonitorInfoController.java

@@ -42,10 +42,10 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
    // @RequiresPermissions("core:info:query")
     @GetMapping(value = "/getInfo")
     public AjaxResult getInfo( Long taskId,Long hostId,Long videoId,String areaValue,String areaName) {
-        if(ObjectUtil.isNotNull(hostId) && ObjectUtil.isNotNull(videoId) ){
-            //传入监控id，因为一个监控对应一个项目
-            return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorByInfo(taskId,hostId,videoId));
-        }
+//        if(ObjectUtil.isNotNull(hostId) && ObjectUtil.isNotNull(videoId) ){
+//            //传入监控id，因为一个监控对应一个项目
+//            return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorByInfo(taskId,hostId,videoId));
+//        }
 
         return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorByInfo(taskId,areaValue,areaName));
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/mapper/CoreMonitoringTaskRegistrationMonitorMapper.java

@@ -85,9 +85,9 @@ public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<
       * @param id
      * @return
      */
- CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
+// CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
 
-    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(@Param("taskId") Long taskId,@Param("host") Long host, @Param("videoChannel")Long videoChannel);
+//    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(@Param("taskId") Long taskId,@Param("host") Long host, @Param("videoChannel")Long videoChannel);
 
     CoreMonitoringTaskRegistrationMonitorVO selectMonitorByAreaCode(@Param("taskId") Long taskId,@Param("areaCode") String host);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ICoreMonitoringTaskRegistrationMonitorService.java

@@ -72,9 +72,9 @@ public interface ICoreMonitoringTaskRegistrationMonitorService extends IService<
 
     CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId);
 
-    CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
+//    CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
 
-    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,Long hostId,Long videoId);
+//    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,Long hostId,Long videoId);
 
     CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,String areaCode,String areaName);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationMonitorServiceImpl.java

@@ -131,41 +131,41 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
         return coreMonitoringTaskRegistrationVO;
     }
 
-    @Override
-    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id) {
-        //查询视频
-        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorById(id);
-        //根据视频查询项目
-        List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
-        coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
-        return coreMonitoringTaskRegistrationMonitorVO;
-    }
-
-    @Override
-    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId, Long hostId, Long videoId) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("task_id", taskId);
-        List<CoreMonitoringTaskRegistration> list = coreMonitoringTaskRegistrationMapper.selectList(queryWrapper);
-        //查询视频
-        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorByInfo(taskId, hostId, videoId);
-        if (null != coreMonitoringTaskRegistrationMonitorVO) {
-            List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
-            coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
-        } else {
-            coreMonitoringTaskRegistrationMonitorVO = new CoreMonitoringTaskRegistrationMonitorVO();
-            SysDevice device = remoteDeviceService.getInfoById(hostId, SecurityConstants.INNER);
-            SysDevice video = remoteDeviceService.getInfoById(videoId, SecurityConstants.INNER);
-            coreMonitoringTaskRegistrationMonitorVO.setHostName(device.getDeviceName());
-            coreMonitoringTaskRegistrationMonitorVO.setVideoChannelName(video.getDeviceName());
-            coreMonitoringTaskRegistrationMonitorVO.setHost(hostId);
-            coreMonitoringTaskRegistrationMonitorVO.setVideoChannel(videoId);
-            coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(new ArrayList<>());
-        }
-        if (CollectionUtils.isNotEmpty(list)) {
-            coreMonitoringTaskRegistrationMonitorVO.setRegistrationId(list.get(0).getId());
-        }
-        return coreMonitoringTaskRegistrationMonitorVO;
-    }
+//    @Override
+//    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id) {
+//        //查询视频
+//        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorById(id);
+//        //根据视频查询项目
+//        List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
+//        coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
+//        return coreMonitoringTaskRegistrationMonitorVO;
+//    }
+
+//    @Override
+//    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId, Long hostId, Long videoId) {
+//        QueryWrapper queryWrapper = new QueryWrapper();
+//        queryWrapper.eq("task_id", taskId);
+//        List<CoreMonitoringTaskRegistration> list = coreMonitoringTaskRegistrationMapper.selectList(queryWrapper);
+//        //查询视频
+//        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorByInfo(taskId, hostId, videoId);
+//        if (null != coreMonitoringTaskRegistrationMonitorVO) {
+//            List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
+//            coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
+//        } else {
+//            coreMonitoringTaskRegistrationMonitorVO = new CoreMonitoringTaskRegistrationMonitorVO();
+//            SysDevice device = remoteDeviceService.getInfoById(hostId, SecurityConstants.INNER);
+//            SysDevice video = remoteDeviceService.getInfoById(videoId, SecurityConstants.INNER);
+//            coreMonitoringTaskRegistrationMonitorVO.setHostName(device.getDeviceName());
+//            coreMonitoringTaskRegistrationMonitorVO.setVideoChannelName(video.getDeviceName());
+//            coreMonitoringTaskRegistrationMonitorVO.setHost(hostId);
+//            coreMonitoringTaskRegistrationMonitorVO.setVideoChannel(videoId);
+//            coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(new ArrayList<>());
+//        }
+//        if (CollectionUtils.isNotEmpty(list)) {
+//            coreMonitoringTaskRegistrationMonitorVO.setRegistrationId(list.get(0).getId());
+//        }
+//        return coreMonitoringTaskRegistrationMonitorVO;
+//    }
 
     @Override
     public CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,String areaCode,String areaName) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -11,13 +11,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.DictConstants;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlan;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
 import com.xunmei.common.core.domain.registerbook.domain.CoreRegisterBookPdf;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.enums.RegisterBookType;
-import com.xunmei.common.core.enums.edu.EduTrainingPlanStatus;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.thread.ThreadPoolConfig;
@@ -40,10 +37,7 @@ import com.xunmei.core.registerbook.service.ICoreRegisterBookPdfService;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskBuilderService;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
-import com.xunmei.system.api.RemoteFileService;
-import com.xunmei.system.api.RemoteOrgService;
-import com.xunmei.system.api.RemoteRoleService;
-import com.xunmei.system.api.RemoteUserService;
+import com.xunmei.system.api.*;
 import com.xunmei.system.api.domain.*;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import io.netty.util.internal.StringUtil;
@@ -61,9 +55,11 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.Duration;
 import java.time.LocalDate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
@@ -111,7 +107,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     @Autowired
     @Qualifier(ThreadPoolConfig.SOC_EXECUTOR)
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
+    @Autowired
+    private RemoteDictDataService dictDataService;
     @Override
     public TableDataInfo selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         //未删除
@@ -1363,6 +1360,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     @Transactional
     @Override
     public int updateTMonitoringRetrievalPlan(TMonitoringRetrievalPlanDto tMonitoringRetrievalPlanDto) throws ParseException {
+        Integer result=1;
         try {
             TMonitoringRetrievalPlan newPlan =new TMonitoringRetrievalPlan();
             BeanUtils.copyProperties(tMonitoringRetrievalPlanDto, newPlan);
@@ -1402,25 +1400,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                     // 编辑的非行社创建计划，需处理子计划
                     if(oldPlan.getOrgType()!="3")
                     {
-//                        SysOrg oldPlanOrg = remoteOrgService.selectSysOrgById(oldPlan.getOrgId(), SecurityConstants.INNER);
-//                        List<TMonitoringRetrievalPlan> subPlans= buildSubPlans(oldPlan,tMonitoringRetrievalPlanDto.getPlanExecOrgIdList(),oldPlanOrg);
-//                        List<TMonitoringRetrievalPlanToExecOrg> planToExecOrgs=new ArrayList<>();
-//                        if(ObjectUtil.isNotEmpty(tMonitoringRetrievalPlanDto.getPlanExecOrgIdList()))
-//                        {
-//                            final List<SysOrg> sysOrgs = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-//                                            remoteOrgService.selectOrgByIdList(tMonitoringRetrievalPlanDto.getPlanExecOrgIdList(), SecurityConstants.INNER),
-//                                    ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
-//                            planToExecOrgs = buildPlanExecOrgs(subPlans, sysOrgs);
-//                        }
-//                        //保存子计划和子计划具体执行机构
-//                        if(ObjectUtil.isNotEmpty(subPlans))
-//                        {
-//                            this.saveBatch(subPlans);
-//                            itMonitoringRetrievalPlanToExecOrgService.saveBatch(planToExecOrgs);
-//                        }
                         iCoreMonitoringRetrievalTaskService.updateComplete(!isComplete, newPlan, oldPlan);
                     }
-                    return 1;
+                    return result;
                 }
                 else // 任务中存在已完成的任务，只能修改任务名称
                 {
@@ -1431,26 +1413,31 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                     if(ObjectUtil.isNotEmpty(subPlanList))
                     {
                         subPlanList.forEach(x->x.setPlanName(oldPlan.getPlanName()));
-                        this.saveBatch(subPlanList);
+                        this.saveOrUpdateBatch(subPlanList);
                     }
-//                    CompletableFuture.runAsync(() -> {
-//                        try{
-//                            clearTaskByPlanId(oldPlan.getId());
-//                            distribute(oldPlan.getId(),true);
-//                        }
-//                        catch (Exception e) {
-//                            e.getMessage();
-//                        }
-//                    }, threadPoolTaskExecutor);
+                    return result;
                 }
-                return 0;
+            }
+            // 停用状态 肯定存在已完成的任务， 只能修改任务名称
+            else if(oldPlan.getPlanStatus()==2)
+            {
+                tMonitoringRetrievalPlanMapper.updateById(oldPlan);
+                QueryWrapper queryWrapper = new QueryWrapper();
+                queryWrapper.eq(PARENT_ID, oldPlan.getId());
+                List<TMonitoringRetrievalPlan> subPlanList = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
+                if(ObjectUtil.isNotEmpty(subPlanList))
+                {
+                    subPlanList.forEach(x->x.setPlanName(oldPlan.getPlanName()));
+                    this.saveOrUpdateBatch(subPlanList);
+                }
+                return result;
             }
         }
         catch (Exception e) {
             e.getMessage();
             return 0;
         }
-        return 0;
+        return result;
     }
 
     // 根据计划Id清除计划下的所有任务
@@ -1609,8 +1596,12 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         accessPdf.setOrgName(accessPdfVO.getOrgName());
 
         List<AccessDataVo> accessDataVos = baseMapper.selectPointByTask(accessPdfVO.getTaskId());
+        List<SysDictData> sysDictData = dictDataService.selectAllDictByeTypeFormDB(DictConstants.CORE_REGISTRATION_PROJECT, SecurityConstants.INNER);
         for (AccessDataVo vo : accessDataVos) {
             vo.setProject(DictUtils.getDictLabel(DictConstants.CORE_REGISTRATION_PROJECT, Integer.parseInt(vo.getProject())));
+            if (ObjectUtil.isEmpty(vo.getProject())){
+                sysDictData.stream().filter(d->d.getDictValue().equals(vo.getProject())).findFirst().ifPresent(d->vo.setProject(d.getDictLabel()));
+            }
         }
         accessPdf.setDataVos(accessDataVos);
         accessPdf.setSignImg(getFileRealPath(accessDataVos.get(0).getSignImg(), prefixPath, staticsPath));

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

@@ -339,6 +339,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             coreEduTrainingTask.setPlanCycle(EduTrainingPlanCycleEnum.NONE.getCode());
             coreEduTrainingTask.setCreateBy(SecurityUtils.getUserId().toString());
             coreEduTrainingTask.setCreateTime(new Date());
+            coreEduTrainingTask.setStatus(EduTrainingDoStatus.WAIT_RECORDED.getCode());
         }
         coreEduTrainingTask.setType(request.getType());
         coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreResumptionConfigurationServiceImpl.java

@@ -287,7 +287,6 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
                 addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
-                remoteSmsService.sendSmsTodo(r.getOrgId(),r.getName(), r.getPlanEndTime());
             });
         }
     }
@@ -302,7 +301,6 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
                 addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
-                remoteSmsService.sendSmsTodo(r.getOrgId(),r.getName(), r.getPlanEndTime());
             });
         }
     }
@@ -317,7 +315,6 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
                 addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
-                remoteSmsService.sendSmsTodo(r.getOrgId(),r.getName(), r.getPlanEndTime());
             });
         }
     }
@@ -332,8 +329,6 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
                 addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
-
-                remoteSmsService.sendSmsTodo(r.getOrgId(),r.getName(), r.getPlanEndTime());
             });
         }
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -167,7 +167,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
                 String orgNames = orgIds.stream().map(orgId -> {
                     final SysOrg sysOrg = orgList.stream().filter(org -> org.getId().equals(orgId)).findFirst().get();
                     if (ObjectUtil.isNotEmpty(sysOrg)) {
-                        if (StringUtil.isNullOrEmpty(sysOrg.getAffiliatedArea()) || sysOrg.getType() < 4 || sysOrg.getShortName().endsWith("地区行社")) {
+                        if (StringUtil.isNullOrEmpty(sysOrg.getAffiliatedArea()) || (ObjectUtil.isNotNull(sysOrg.getType()) && sysOrg.getType() < 4) || sysOrg.getShortName().endsWith("地区行社")) {
                             return sysOrg.getShortName();
                         }
                         return sysOrg.getAffiliatedBank() + "-" + sysOrg.getShortName();
@@ -470,11 +470,12 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
             .isNull(CoreOutInRecord::getDepartureTime)
             .le(CoreOutInRecord::getOutInRequestEffectiveEndTime,currentDate);
         List<CoreOutInRecord> outInRecords = coreOutInRecordMapper.selectList(oqw1);
-        outInRecords.stream().forEach(x->x.setStatus(3));
-
-        // 将出入记录设置为已失效状态
-        coreOutInRecordMapper.batchUpdateCoreOutInRecordStatus(outInRecords);
+        if(ObjectUtil.isNotEmpty(outInRecords)){
+            outInRecords.stream().forEach(x->x.setStatus(3));
 
+            // 将出入记录设置为已失效状态
+            coreOutInRecordMapper.batchUpdateCoreOutInRecordStatus(outInRecords);
+        }
     }
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -190,8 +190,17 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteCoreOutInRecordByIds(Long[] ids) {
-        // 取消出入申请后，出入申请中对应的人员也删除，如申请下的人员都取消，申请也自动取消
+        // 获取取消出入申请的 出入记录
         final List<CoreOutInRecord> letterOutInRecordList = coreOutInRecordMapper.findLetterOutInRecordList(ids);
+
+        // 取消申请时需要判断 是否已审批通过，审批通过后不能取消
+        if(letterOutInRecordList.stream().anyMatch(x->ObjectUtil.equal(x.getStatus(),1) || ObjectUtil.equal(x.getStatus(),2) || ObjectUtil.equal(x.getStatus(),3)))
+        {
+            throw new RuntimeException("取消失败，当前出入记录审批状态已变化，请刷新");
+        };
+
+        // 取消出入申请后，出入申请中对应的人员也删除，如申请下的人员都取消，申请也自动取消
+//        final List<CoreOutInRecord> letterOutInRecordList = coreOutInRecordMapper.findLetterOutInRecordList(ids);
         letterOutInRecordList.forEach(x -> {
             deleteOutInRecordRequestUser(x);
         });

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -37,6 +37,7 @@ import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -178,7 +179,29 @@ public class PanelServiceImpl implements PanelService {
             List<PanelListVo> data = map.getValue();
             vo.setNums(data.size());
             vo.setTaskTypeText(PanelTypeEnums.getName(map.getKey()));
-            vo.setDataList(data);
+            if(ObjectUtil.equal(map.getKey(),PanelTypeEnums.SAFETY_CHECK.getCode())){
+                if(data.size()>0)
+                {
+                    Map<String, List<PanelListVo>> groupedItems = data.stream()
+                            .collect(Collectors.groupingBy(PanelListVo::getTaskName));
+                    List<PanelListVo> tempData=new ArrayList<>();
+
+                    for (Map.Entry<String, List<PanelListVo>> entry : groupedItems.entrySet()) {
+                        PanelListVo parentItem=new PanelListVo();
+                        BeanUtils.copyProperties(entry.getValue().get(0),parentItem);
+                        parentItem.setUncompleted(entry.getValue());
+                        tempData.add(parentItem);
+                    }
+                    vo.setDataList(tempData);
+                }
+                else {
+                    vo.setDataList(data);
+                }
+            }
+            else {
+
+                vo.setDataList(data);
+            }
             list.add(vo);
         }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

@@ -123,12 +123,12 @@ public class ResumptionServiceImpl implements ResumptionService {
         if (sysResumption.getStatus() == 4) {
             throw new RuntimeException("该任务已过期不能完成提交");
         }
-        if (ObjectUtil.equal(1, taskDetailVo.getSubType()) && ObjectUtil.notEqual(ResumptionStatus.NO_START.getCode(), sysResumption.getStatus())) {
+        if (ObjectUtil.equal(1, taskDetailVo.getSubType()) && ObjectUtil.notEqual(ResumptionStatus.NO_START.getCode(), sysResumption.getStatus())&&ObjectUtil.notEqual(ResumptionStatus.PROGRESS.getCode(), sysResumption.getStatus())) {
             throw new RuntimeException("当前状态不允许修改,请退出当前页面后刷新重试!");
         }
-        if (ObjectUtil.equal(2, taskDetailVo.getSubType()) && ObjectUtil.notEqual(ResumptionStatus.NO_START.getCode(), sysResumption.getStatus()) && ObjectUtil.notEqual(ResumptionStatus.PROGRESS.getCode(), sysResumption.getStatus())) {
+        /*if (ObjectUtil.equal(2, taskDetailVo.getSubType()) && ObjectUtil.equal(ResumptionStatus.NO_START.getCode(), sysResumption.getStatus()) && ObjectUtil.notEqual(ResumptionStatus.PROGRESS.getCode(), sysResumption.getStatus())) {
             throw new RuntimeException("当前状态不允许修改,请退出当前页面后刷新重试!");
-        }
+        }*/
 
 
         AppPlan appPlan = appPlanMapper.getById(sysResumption.getPlanId());

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

@@ -444,10 +444,10 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         }
         if (!isNewTask) {
             CoreSafetyTask safetyTask = getById(data.getId());
-            if (ObjectUtil.equal(data.getIsSubmit(), 0) && ObjectUtil.notEqual(safetyTask.getStatus(), SafetyCheckTaskStatus.Waiting.getValue())) {
+            if (ObjectUtil.equal(data.getIsSubmit(), 0) && ObjectUtil.equal(safetyTask.getStatus(), SafetyCheckTaskStatus.Completed.getValue())) {
                 throw new ServiceException("当前状态不允许修改,请退出当前页面后刷新重试!");
             }
-            if (ObjectUtil.equal(data.getIsSubmit(), 1) && ObjectUtil.notEqual(safetyTask.getStatus(), SafetyCheckTaskStatus.UnderWay.getValue())) {
+            if (ObjectUtil.equal(data.getIsSubmit(), 1) && ObjectUtil.equal(safetyTask.getStatus(), SafetyCheckTaskStatus.Completed.getValue())) {
                 throw new ServiceException("当前状态不允许修改,请退出当前页面后刷新重试!");
             }
 

soc-modules/soc-modules-core/src/main/resources/mapper/access/CoreMonitoringTaskRegistrationMonitorMapper.xml

@@ -77,34 +77,34 @@ FROM
     core_monitoring_task_registration_monitor
 WHERE task_registration_id = #{taskRegistrationId}
     </select>
-    <select id="selectMonitorById"
-            resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">
-        SELECT cmtrm.id            AS id,
-               cmtrm.`host`        AS `host`,
-               cmtrm.video_channel AS videoChannel,
-               sd.device_name      AS hostName,
-               sd1.device_name     AS videoChannelName
-        FROM core_monitoring_task_registration_monitor cmtrm
-                 LEFT JOIN sys_device sd ON sd.id = cmtrm.`host`
-                 LEFT JOIN sys_device sd1 ON sd1.host_id = sd.id
-        WHERE cmtrm.id = #{id}
-    </select>
-    <select id="selectMonitorByInfo"
-            resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">
-        SELECT b.id            AS id,
-               b.`host`        AS `host`,
-               b.video_channel AS videoChannel,
-               sd.device_name  AS hostName,
-             sd1.device_name  	AS videoChannelName
-        FROM core_monitoring_task_registration a
-                 LEFT JOIN core_monitoring_task_registration_monitor b ON a.id = b.task_registration_id
-                 LEFT JOIN sys_device sd ON sd.id = b.`host`
-                 LEFT JOIN sys_device sd1 ON sd1.host_id = sd.id
-        WHERE a.task_id = #{taskId}
-          AND b.`host` = #{host}
-          AND b.video_channel = #{videoChannel}
-          AND sd1.id = #{videoChannel}
-    </select>
+<!--    <select id="selectMonitorById"-->
+<!--            resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">-->
+<!--        SELECT cmtrm.id            AS id,-->
+<!--               cmtrm.`host`        AS `host`,-->
+<!--               cmtrm.video_channel AS videoChannel,-->
+<!--               sd.device_name      AS hostName,-->
+<!--               sd1.device_name     AS videoChannelName-->
+<!--        FROM core_monitoring_task_registration_monitor cmtrm-->
+<!--                 LEFT JOIN sys_device sd ON sd.id = cmtrm.`host`-->
+<!--                 LEFT JOIN sys_device sd1 ON sd1.host_id = sd.id-->
+<!--        WHERE cmtrm.id = #{id}-->
+<!--    </select>-->
+<!--    <select id="selectMonitorByInfo"-->
+<!--            resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">-->
+<!--        SELECT b.id            AS id,-->
+<!--               b.`host`        AS `host`,-->
+<!--               b.video_channel AS videoChannel,-->
+<!--               sd.device_name  AS hostName,-->
+<!--             sd1.device_name  	AS videoChannelName-->
+<!--        FROM core_monitoring_task_registration a-->
+<!--                 LEFT JOIN core_monitoring_task_registration_monitor b ON a.id = b.task_registration_id-->
+<!--                 LEFT JOIN sys_device sd ON sd.id = b.`host`-->
+<!--                 LEFT JOIN sys_device sd1 ON sd1.host_id = sd.id-->
+<!--        WHERE a.task_id = #{taskId}-->
+<!--          AND b.`host` = #{host}-->
+<!--          AND b.video_channel = #{videoChannel}-->
+<!--          AND sd1.id = #{videoChannel}-->
+<!--    </select>-->
 
     <select id="selectMonitorByAreaCode"
             resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -307,11 +307,11 @@
     </select>
     <select id="selectSyntheticInout" resultType="com.xunmei.core.board.vo.app.AppSyntheticInOutVo">
         SELECT COUNT(*)        as total,
-               sum(l.type = 1) as department,
-               sum(l.type = 2) as temporary,
-               sum(l.type = 3) as emergency
+               sum(l.letter_type = 1) as department,
+               sum(l.letter_type = 2) as temporary,
+               sum(l.letter_type = 3) as emergency
         FROM core_out_in_record r
-                 INNER JOIN core_introduce_letter l ON r.letter_id = l.id
+                 INNER JOIN core_introduce_letter_out_in_request l ON r.out_in_request_id = l.id
                  INNER JOIN sys_org o ON r.org_id = o.id
         where arrival_time >= #{startDate}
           AND arrival_time &lt;= #{endDate}

soc-modules/soc-modules-core/src/main/resources/mapper/board/CockpitMapper.xml

@@ -189,11 +189,11 @@
     </select>
     <select id="currentMonthVisitInfo" resultType="com.xunmei.core.board.vo.web.VisitInfoVo">
         SELECT COUNT(*)        as total,
-               sum(l.type = 1) as electronicCount,
-               sum(l.type = 2) as paperCount,
-               sum(l.type = 3) as urgencyCount
+               sum(l.letter_type = 1) as electronicCount,
+               sum(l.letter_type = 2) as paperCount,
+               sum(l.letter_type = 3) as urgencyCount
         FROM core_out_in_record r
-                 INNER JOIN core_introduce_letter l ON r.letter_id = l.id
+                 INNER JOIN core_introduce_letter_out_in_request l ON r.out_in_request_id = l.id
                  INNER JOIN sys_org o ON r.org_id = o.id
         where arrival_time >= #{startDate}
           and o.path LIKE CONCAT(#{orgPath}, '%')

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -135,24 +135,10 @@
     <select id="selectListApp"
             resultType="com.xunmei.common.core.domain.retrieval.vo.AppCoreMonitoringRetrievalTaskVO">
         SELECT
-        IF
-        (
-        IF
-        ( COUNT( b.id ) > 0, 1, 0 )+
-        IF
-        ( COUNT( c.id ) > 0, 1, 0 )= 2,
-        1,
-        0
-        ) as isExist,
+        1 as isExist,
         a.*
         FROM
         core_monitoring_retrieval_task a
-        LEFT JOIN sys_device b ON a.org_id = b.org_id
-        AND b.del_flag = '0'
-        AND b.device_type = '0'
-        LEFT JOIN sys_device c ON c.org_id = a.org_id
-        AND c.del_flag = '0'
-        AND c.device_type = '2'
         WHERE 1=1 and is_deleted=0
         <if test="request.orgId != null ">
             and a.org_id = #{request.orgId}
@@ -657,21 +643,9 @@
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
         select distinct t.id as id, task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as
         endTime,t.status,
-        IF
-        (
-        IF
-        ( COUNT( b.id ) > 0, 1, 0 )+
-        IF
-        ( COUNT( c.id ) > 0, 1, 0 )= 2,
-        1,
-        0
-        ) AS isExist
-        from core_monitoring_retrieval_task t LEFT JOIN sys_device b ON t.org_id = b.org_id
-        AND b.del_flag = '0'
-        AND b.device_type = '0'
-        LEFT JOIN sys_device c ON c.org_id = t.org_id
-        AND c.del_flag = '0'
-        AND c.device_type = '2' where t.org_id =#{request.orgId} and t.role_id in
+        1 AS isExist
+        from core_monitoring_retrieval_task t
+        where t.org_id =#{request.orgId} and t.role_id in
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
         </foreach>

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -888,7 +888,7 @@
     </select>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status
+        select distinct t.id as id, title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status,t.org_name as beCheckedOrgName
         from core_safety_task t
         where (t.grant_user_id = #{request.userId} or ( t.check_org_id =#{request.orgId}
         and t.plan_id in (select id from core_safecheck_plan p

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -244,9 +244,9 @@ public class PdfUtil {
 
         final List<LinkedHashMap> questionPdfVoList = (List<LinkedHashMap>) data.get("questions");
         if (ObjectUtil.isEmpty(questionPdfVoList)) {
-            PdfUtil.createPDFCell(tableFont, table, "无", Element.ALIGN_MIDDLE, 2, 1);
-            PdfUtil.createPDFCell(tableFont, table, StringUtil.EMPTY_STRING, Element.ALIGN_LEFT, 4, 1);
-            PdfUtil.createPDFCell(tableFont, table, StringUtil.EMPTY_STRING, Element.ALIGN_MIDDLE, 4, 1);
+            PdfUtil.createPDFCell(tableFont, table, "/", Element.ALIGN_MIDDLE, 2, 1);
+            PdfUtil.createPDFCell(tableFont, table, "/", Element.ALIGN_MIDDLE, 4, 1);
+            PdfUtil.createPDFCell(tableFont, table, "/", Element.ALIGN_MIDDLE, 4, 1);
             document.add(table);
             return;
         }
@@ -637,15 +637,19 @@ public class PdfUtil {
         PdfUtil.createPDFCell(tableFont, table, "检查工作情况", Element.ALIGN_MIDDLE, 14, 1);
 
         List<CheckDataVo> normalDataList = data.getCheckDatas().stream().filter(d -> ObjectUtil.equal(Boolean.TRUE, d.getCheckStatus())).collect(Collectors.toList());
+        PdfUtil.createPDFCell(tableFont, table, "序号", Element.ALIGN_MIDDLE, 2, 1);
+        PdfUtil.createPDFCell(tableFont, table, "检查内容", Element.ALIGN_MIDDLE, 10, 1);
+        PdfUtil.createPDFCell(tableFont, table, "检查情况", Element.ALIGN_MIDDLE, 2, 1);
         if (normalDataList.size() > 0) {
-            PdfUtil.createPDFCell(tableFont, table, "序号", Element.ALIGN_MIDDLE, 2, 1);
-            PdfUtil.createPDFCell(tableFont, table, "检查内容", Element.ALIGN_MIDDLE, 10, 1);
-            PdfUtil.createPDFCell(tableFont, table, "检查情况", Element.ALIGN_MIDDLE, 2, 1);
             for (CheckDataVo checkDataVo : normalDataList) {
                 PdfUtil.createPDFCell(tableFont, table, String.valueOf(normalDataList.indexOf(checkDataVo) + 1), Element.ALIGN_MIDDLE, 2, 1);
                 PdfUtil.createPDFCell(tableFont, table, checkDataVo.getPointName(), Element.ALIGN_MIDDLE, 10, 1);
                 PdfUtil.createPDFCell(tableFont, table, "正常", Element.ALIGN_MIDDLE, 2, 1);
             }
+        }else {
+            PdfUtil.createPDFCell(tableFont, table, "/", Element.ALIGN_MIDDLE, 2, 1);
+            PdfUtil.createPDFCell(tableFont, table, "/", Element.ALIGN_MIDDLE, 10, 1);
+            PdfUtil.createPDFCell(tableFont, table, "/", Element.ALIGN_MIDDLE, 2, 1);
         }
 
 

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

@@ -24,7 +24,7 @@
           and org_path like concat(#{orgPath}, "%")
     </select>
     <select id="sensor" resultType="com.xunmei.iot.vo.board.IotBoardOverviewItemVo">
-        SELECT '动环设备'             AS `name`,
+        SELECT '传感器设备'             AS `name`,
                count(0)           AS count,
                sum(state = 0)     AS normal,
                sum(state = 1)     AS exception,

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

@@ -1,15 +1,14 @@
 package com.xunmei.mediator.api.service.impl;
 
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.nacos.common.utils.JacksonUtils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.CacheConstants;
-import com.xunmei.common.core.domain.iot.domain.*;
+import com.xunmei.common.core.domain.iot.domain.IotDevice;
+import com.xunmei.common.core.domain.iot.domain.IotDvrDisk;
+import com.xunmei.common.core.domain.iot.domain.IotDvrDiskLog;
+import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetection;
 import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.redis.utils.RedisUtils;
@@ -25,13 +24,10 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.enums.DataType;
 import com.xunmei.system.api.util.LogUtils;
 import com.xunmei.system.api.vo.SysOrgVO;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -173,10 +169,10 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
                 errors.add(error);
                 continue;
             }
-            final List<IotDvrDisk> diskList = listMap.get(hostDeviceOptional.get().getEquipmentCode());
+            List<IotDvrDisk> diskList = listMap.get(hostDeviceOptional.get().getEquipmentCode());
             List<DvrdiskDto> diskSpaces = pageDto.getDiskSpace();
-            if (ObjectUtil.hasEmpty(diskSpaces, diskList)) {
-                return map;
+            if (ObjectUtil.isNull(diskList)) {
+                diskList=new ArrayList<>();
             }
             for (DvrdiskDto dto : diskSpaces) {
                 List<String> fields = new ArrayList<>();

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/SmsService.java

@@ -44,26 +44,26 @@ public class SmsService implements ISmsService {
     /**
      * 在ESB系统里的 系统编码
      */
-    @Value("${systemCode}")
+    @Value("${sms.system.code}")
     private String systemCode;
 
     /**
      * 系统名称
      */
-    @Value("${systemName}")
+    @Value("${sms.system.name}")
     private String systemName;
 
 
     /**
      * 服务代码
      */
-    @Value("${serviceCode}")
+    @Value("${sms.service.code}")
     private String serviceCode;
 
     /**
      * 服务场景
      */
-    @Value("${serviceScene}")
+    @Value("${sms.service.scene}")
     private String serviceScene;
 
 

soc-modules/soc-modules-sms/src/main/resources/esb-client.properties

@@ -1,4 +1,4 @@
-url=http://192.111.37.206:30174/YDAQBWGLXT
+url=http://esb.app.sc:30174/YDAQBWGLXT
 uid=YDAQBWGLXT
 readTimeout=60
 connTimeout=10

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDictDataController.java

@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -84,6 +83,12 @@ public class SysDictDataController extends BaseController {
         return data;
     }
 
+    @ApiOperation(value = "根据字典类型查询字典数据信息")
+    @GetMapping(value = "/fromDB/{dictType}")
+    public List<SysDictData> selectAllDictByeTypeFormDB(@PathVariable String dictType) {
+        return dictTypeService.selectAllDictByeTypeFormDB(dictType);
+    }
+
     /**
      * 新增字典类型
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysDictTypeMapper.java

@@ -3,6 +3,7 @@ package com.xunmei.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysDictType;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -84,4 +85,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType>
      * @return 结果
      */
      SysDictType checkDictTypeUnique(String dictType);
+
+    List<SysDictData> selectAllDictByeTypeFormDB(@Param("dictType") String dictType);
+
 }

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

@@ -104,4 +104,6 @@ public interface ISysDictTypeService extends IService<SysDictType>
      * @return 结果
      */
     boolean checkDictTypeUnique(SysDictType dictType);
+
+    List<SysDictData> selectAllDictByeTypeFormDB(String dictType);
 }

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

@@ -1,7 +1,6 @@
 package com.xunmei.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.constant.UserConstants;
@@ -11,7 +10,6 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysDictType;
-import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.mapper.SysDictDataMapper;
 import com.xunmei.system.mapper.SysDictTypeMapper;
 import com.xunmei.system.service.ISysDictTypeService;
@@ -240,4 +238,10 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
         }
         return UserConstants.UNIQUE;
     }
+
+    @Override
+    public List<SysDictData> selectAllDictByeTypeFormDB(String dictType) {
+
+        return baseMapper.selectAllDictByeTypeFormDB(dictType);
+    }
 }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -101,5 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
-</mapper> 
+
+	<select id="selectAllDictByeTypeFormDB" resultType="com.xunmei.system.api.domain.SysDictData">
+		select *
+		from sys_dict_data
+		where dict_type = #{dictType}
+    </select>
+</mapper>