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

project_data/sql/0.0.2/soc/soc.sql

@@ -1034,6 +1034,18 @@ NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_m
 ALTER TABLE `core_monitoring_retrieval_plan` ADD COLUMN `immediately` bit(1) NULL DEFAULT NULL COMMENT '立即生成任务';
 
 END IF;
+-- 调阅任务绑定硬盘录像机
+  IF
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_monitoring_task_registration_monitor' AND COLUMN_NAME = 'host_name' ) THEN
+ALTER TABLE `core_monitoring_task_registration_monitor` ADD COLUMN `host_name` VARCHAR ( 255 ) DEFAULT NULL COMMENT '硬盘录像机';
+
+END IF;
+-- 调阅任务绑定摄像机
+  IF
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_monitoring_task_registration_monitor' AND COLUMN_NAME = 'video_channel_name' ) THEN
+ALTER TABLE `core_monitoring_task_registration_monitor` ADD COLUMN `video_channel_name` VARCHAR ( 255 ) DEFAULT NULL COMMENT '摄像机';
+
+END IF;
 	-- 履职计划是否下发标识
     IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_resumption_plan' AND COLUMN_NAME = 'distribute' ) THEN

soc-auth/src/main/java/com/xunmei/auth/service/FJNXLoginService.java

@@ -175,7 +175,7 @@ public class FJNXLoginService{
      */
     public String getUserByAppToken(String token){
 
-        String account_url = MessageFormat.format(accountUrl,appCode,token);
+        String account_url = MessageFormat.format(accountUrl,appHost,token);
 
         String accountInfo = HttpUtil.post(account_url,new HashMap<>());
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/CoreMonitoringTaskRegistrationMonitor.java

@@ -49,7 +49,10 @@ public class CoreMonitoringTaskRegistrationMonitor extends BaseEntity {
     @ApiModelProperty(value = "监控主机id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long host;
-
+    @ApiModelProperty(value = "监控主机名")
+    private String hostName;
+    @ApiModelProperty(value = "视频通道名")
+    private String videoChannelName;
     /**
      * 视频通道
      */

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
@@ -13,6 +14,8 @@ import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMonitorMapper;
 import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
+import com.xunmei.system.api.RemoteDeviceService;
+import com.xunmei.system.api.domain.SysDevice;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +24,8 @@ import java.util.Arrays;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+
 
 /**
  * 调阅任务登记检查情况Service业务层处理
@@ -35,7 +40,8 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
     private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
     @Autowired
     private CoreMonitoringTaskRegistrationMonitorMapper coreMonitoringTaskRegistrationMonitorMapper;
-
+@Resource
+private RemoteDeviceService remoteDeviceService;
 
     /**
      * 查询调阅任务登记检查情况
@@ -76,6 +82,10 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         coreMonitoringTaskMonitorInfo.setCreateTime(DateUtils.getNowDate());
         coreMonitoringTaskMonitorInfo.setCreateBy(SecurityUtils.getUsername());
         coreMonitoringTaskMonitorInfo.setId(IdWorker.getId());
+        SysDevice sysDevice = remoteDeviceService.getInfoById(coreMonitoringTaskRegistrationMonitorDTO.getHost(), SecurityConstants.INNER);
+        SysDevice sysDevice1 = remoteDeviceService.getInfoById(coreMonitoringTaskRegistrationMonitorDTO.getVideoChannel(), SecurityConstants.INNER);
+        coreMonitoringTaskMonitorInfo.setHostName(sysDevice.getDeviceName());
+        coreMonitoringTaskMonitorInfo.setVideoChannelName(sysDevice1.getDeviceName());
         int i = 0;
         i = coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo);
         //新增项目
@@ -143,6 +153,10 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
           coreMonitoringTaskMonitorInfo1.setCreateBy(SecurityUtils.getUsername());
           coreMonitoringTaskMonitorInfo1.setId(IdWorker.getId());
           coreMonitoringTaskMonitorInfo1.setTaskRegistrationId(coreMonitoringTaskRegistrationMonitorDTO.getTaskRegistrationId());
+          SysDevice sysDevice = remoteDeviceService.getInfoById(coreMonitoringTaskRegistrationMonitorDTO.getHost(), SecurityConstants.INNER);
+          SysDevice sysDevice1 = remoteDeviceService.getInfoById(coreMonitoringTaskRegistrationMonitorDTO.getVideoChannel(), SecurityConstants.INNER);
+          coreMonitoringTaskMonitorInfo1.setHostName(sysDevice.getDeviceName());
+          coreMonitoringTaskMonitorInfo1.setVideoChannelName(sysDevice1.getDeviceName());
           i = coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo1);
           //新增项目
           List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfoList = coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/vo/CoreMonitoringTaskRegistrationMonitorVO.java

@@ -15,11 +15,6 @@ import java.util.List;
  */
 @Data
 public class CoreMonitoringTaskRegistrationMonitorVO extends CoreMonitoringTaskRegistrationMonitor {
-    @ApiModelProperty(value = "主机名")
-    private String hostName;
-    @ApiModelProperty(value = "监控通道名")
-    private String videoChannelName;
-
     @ApiModelProperty(value = "nfcId")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long registrationId;

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

@@ -115,7 +115,7 @@ public class ApiPlanController {
         try {
             appPlanService.saveOrUpdatePlan(info);
             //立即执行
-            if (info.isBuildTaskNow()) {
+            if (info.getOrgType()==3&&info.isBuildTaskNow()) {
                 DateTime datetime = new DateTime();
                 datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
                 //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建

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

@@ -208,7 +208,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         //修改所有子计划
         List<AppPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, id));
         //如果不存在子计划直接返回
-        if(appPlans==null||appPlans.size()==0){
+        if (appPlans == null || appPlans.size() == 0) {
             return 0;
         }
         for (AppPlan ap :
@@ -279,7 +279,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             if (size > 0) {
                 throw new RuntimeException("计划名称重复，请确认！");
             }
-
+            //如果计划为行社并且勾选立即生效
+            if (app.getOrgType()==3&&app.isBuildTaskNow()) {
+                plan.setPlanStatus(1);
+            } else {
+                plan.setPlanStatus(0);
+            }
             plan.setDistribute("0");
             baseMapper.insert(plan);
             Long id = plan.getId();

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

@@ -65,15 +65,15 @@
     </select>
     <select id="selectMonitorByTaskRegistrationId"
             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 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
-        WHERE cmtrm.task_registration_id = #{taskRegistrationId}
+SELECT
+    id AS id,
+    `host` AS `host`,
+    video_channel AS videoChannel,
+    video_channel_name AS videoChannelName,
+    host_name AS hostName
+FROM
+    core_monitoring_task_registration_monitor
+WHERE task_registration_id = #{taskRegistrationId}
     </select>
     <select id="selectMonitorById"
             resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">

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

@@ -145,8 +145,7 @@
         <if test="request.moth !=null">
             and ymd_date like concat('%', #{request.moth}, '%')
         </if>
-        ORDER BY
-        `status` desc,
+        ORDER BY FIELD(`status`,'1','0','2','3'),
         create_time DESC
     </select>
     <select id="selectTaskDataVoListByRetrievalTaskId"