Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/CoreResumptionConfigurationController.java

@@ -29,27 +29,14 @@ import java.util.List;
 public class CoreResumptionConfigurationController extends BaseController {
     @Autowired
     private ICoreResumptionConfigurationService coreResumptionConfigurationService;
-
-/**
- * 查询履职任务定时提醒列表
- */
-/*@ApiOperation(value = "查询CoreResumptionConfiguration列表")
-@RequiresPermissions("system:configuration:list")
-@GetMapping("/list")
-    public TableDataInfo<CoreResumptionConfiguration> list(CoreResumptionConfiguration coreResumptionConfiguration) {
-
-        return coreResumptionConfigurationService.selectPage( coreResumptionConfiguration);
-    }*/
-
-
     /**
      * 获取履职任务定时提醒详细信息
      */
     @ApiOperation(value = "获取CoreResumptionConfiguration详细信息")
     @RequiresPermissions("system:configuration:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(coreResumptionConfigurationService.selectCoreResumptionConfigurationById(id));
+    @GetMapping("/list")
+    public AjaxResult getInfo() {
+        return success(coreResumptionConfigurationService.selectCoreResumptionConfigurationById());
     }
 
     /**

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.CoreResumptionConfiguration;
 import com.xunmei.core.resumption.dto.CoreResumptionConfigurationDTO;
+import com.xunmei.core.resumption.vo.CoreResumptionConfigurationVO;
 
 import java.util.List;
 
@@ -21,7 +22,7 @@ public interface ICoreResumptionConfigurationService extends IService<CoreResump
      * @param id 履职任务定时提醒主键
      * @return 履职任务定时提醒
      */
-    CoreResumptionConfiguration selectCoreResumptionConfigurationById(Long id);
+    CoreResumptionConfigurationVO selectCoreResumptionConfigurationById();
 
     /**
      * 查询履职任务定时提醒列表
@@ -63,11 +64,4 @@ public interface ICoreResumptionConfigurationService extends IService<CoreResump
      */
     int deleteCoreResumptionConfigurationById(Long id);
 
-    /**
-     * 查询履职任务定时提醒分页数据
-     *
-     * @param coreResumptionConfiguration 查询条件对象
-     * @return Page
-     */
-    //   TableDataInfo<CoreResumptionConfiguration> selectPage(CoreResumptionConfiguration coreResumptionConfiguration);
 }

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

@@ -10,6 +10,7 @@ import com.xunmei.core.resumption.domain.CoreResumptionConfiguration;
 import com.xunmei.core.resumption.dto.CoreResumptionConfigurationDTO;
 import com.xunmei.core.resumption.mapper.CoreResumptionConfigurationMapper;
 import com.xunmei.core.resumption.service.ICoreResumptionConfigurationService;
+import com.xunmei.core.resumption.vo.CoreResumptionConfigurationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -73,8 +74,11 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
      * @return 履职任务定时提醒
      */
     @Override
-    public CoreResumptionConfiguration selectCoreResumptionConfigurationById(Long id) {
-        return coreResumptionConfigurationMapper.selectById(id);
+    public CoreResumptionConfigurationVO selectCoreResumptionConfigurationById() {
+        CoreResumptionConfigurationVO coreResumptionConfigurationVO=new CoreResumptionConfigurationVO();
+        List<CoreResumptionConfiguration> coreResumptionConfigurations = coreResumptionConfigurationMapper.selectList(new QueryWrapper<CoreResumptionConfiguration>());
+        coreResumptionConfigurationVO.setCoreResumptionConfiguration(coreResumptionConfigurations);
+        return coreResumptionConfigurationVO;
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/CoreResumptionConfigurationVO.java

@@ -0,0 +1,15 @@
+package com.xunmei.core.resumption.vo;
+
+import com.xunmei.core.resumption.domain.CoreResumptionConfiguration;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/9/15
+ */
+@Data
+public class CoreResumptionConfigurationVO {
+    List<CoreResumptionConfiguration> coreResumptionConfiguration;
+}

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

@@ -68,8 +68,8 @@
         SELECT cmtrm.id            AS id,
                cmtrm.`host`        AS `host`,
                cmtrm.video_channel AS videoChannel,
-               sd.device_name      AS hostName,
-               sd1.device_name     AS videoChannelName
+               CONCAT('通道', sd.channel  )	AS videoChannelName,
+               sd1.device_name     AS hostName
         FROM core_monitoring_task_registration_monitor cmtrm
                  LEFT JOIN sys_device sd ON sd.id = cmtrm.video_channel
                  LEFT JOIN sys_device sd1 ON sd1.id = sd.host_id
@@ -93,7 +93,7 @@
                b.`host`        AS `host`,
                b.video_channel AS videoChannel,
                sd.device_name  AS hostName,
-               CONCAT('通道',sd1.channel  )	AS videoChannelName
+             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`

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

@@ -172,7 +172,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
                 sysDevices.forEach(s -> {
                     VideoVO videoVO = new VideoVO();
                     videoVO.setVideoId(s.getId());
-                    videoVO.setVideoName(s.getDeviceName());
+                    videoVO.setVideoName("通道"+s.getChannel());
                     List<AccessType> accessByVideo = sysDeviceMapper.getAccessByVideo(s.getId(), taskId);
                     if (accessByVideo.size()>0) {
                         for (AccessType a:accessByVideo){

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

@@ -45,7 +45,7 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
             page = new Page<>();
         }
         QueryWrapper<SysDictData> where = new QueryWrapper<>(dictData);
-
+        where.orderByAsc("dict_sort");
         dictDataMapper.selectPage(page, where);
         return TableDataInfo.build(page);
     }