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

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

@@ -67,8 +67,8 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
     @RequiresPermissions("system:info:add")
     @Log(title = "调阅任务登记检查情况", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskMonitorInfo) {
-        return toAjax(coreMonitoringTaskMonitorInfoService.insertCoreMonitoringTaskMonitorInfo(coreMonitoringTaskMonitorInfo));
+    public AjaxResult add(@RequestBody CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskRegistrationMonitorDTO) {
+        return toAjax(coreMonitoringTaskMonitorInfoService.insertCoreMonitoringTaskMonitorInfo(coreMonitoringTaskRegistrationMonitorDTO));
     }
 
     /**

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

@@ -12,6 +12,8 @@ import lombok.experimental.Accessors;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+
 /**
  * 监控调阅计划对象 t_monitoring_retrieval_plan
  *
@@ -44,7 +46,12 @@ public class TMonitoringRetrievalPlan extends BaseEntity {
     @ApiModelProperty(value = "计划归属机构")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
-
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+    @ApiModelProperty(value = "下发类型0自建1下发")
+    private Integer createType;
     /**
      * 计划归属机构
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationMonitorDTO.java

@@ -2,8 +2,12 @@ package com.xunmei.core.access.dto;
 
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
@@ -11,7 +15,11 @@ import java.util.List;
  * @author :LuoWei
  * @date : 2023/8/29
  */
+@ApiModel(description = "项目提交数据")
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class CoreMonitoringTaskRegistrationMonitorDTO extends CoreMonitoringTaskRegistrationMonitor {
     @ApiModelProperty(value = "项目列表")
     private List<CoreMonitoringTaskMonitorInfo>coreMonitoringTaskMonitorInfoList;

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

@@ -106,14 +106,16 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         coreMonitoringTaskMonitorInfo.setTaskRegistrationId(coreMonitoringTaskRegistrationMonitorDTO.getTaskRegistrationId());
         coreMonitoringTaskMonitorInfo.setCreateTime(DateUtils.getNowDate());
         coreMonitoringTaskMonitorInfo.setCreateBy(SecurityUtils.getUsername());
-        coreMonitoringTaskRegistrationMonitorMapper.insertCoreMonitoringTaskRegistrationMonitor(coreMonitoringTaskMonitorInfo);
+     //   coreMonitoringTaskRegistrationMonitorMapper.insertCoreMonitoringTaskRegistrationMonitor(coreMonitoringTaskMonitorInfo);
+        coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo);
         //新增项目
         List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfoList = coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList();
         int i = 0;
         for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskMonitorInfoList) {
             c.setCreateTime(DateUtils.getNowDate());
             c.setCreateBy(SecurityUtils.getUsername());
-            i = coreMonitoringTaskMonitorInfoMapper.insertCoreMonitoringTaskMonitorInfo(c);
+          //  i = coreMonitoringTaskMonitorInfoMapper.insertCoreMonitoringTaskMonitorInfo(c);
+          i=  coreMonitoringTaskMonitorInfoMapper.insert(c);
             if (i < 1) {
                 return i;
             }

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

@@ -45,11 +45,12 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     private RemoteOrgService remoteOrgService;
     @Autowired
     private RemoteRoleService remoteRoleService;
-
+private static final Long MINUS_ONE=-1L;
+private static final Long ZERO=0L;
     @Override
     public TableDataInfo<TMonitoringRetrievalPlan> selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         //未删除
-        tMonitoringRetrievalPlan.setIsDeleted(0L);
+        tMonitoringRetrievalPlan.setIsDeleted(ZERO);
         Page<TMonitoringRetrievalPlan> page;
         //分页
         if (tMonitoringRetrievalPlan.getPageNum() != null && tMonitoringRetrievalPlan.getPageSize() != null) {
@@ -64,7 +65,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         QueryWrapper<TMonitoringRetrievalPlan> query = new QueryWrapper<>(tMonitoringRetrievalPlan);
         //下穿
         tMonitoringRetrievalPlan.setCheckSub(true);
-        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(-1L, SecurityConstants.INNER);
+        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(-MINUS_ONE, SecurityConstants.INNER);
         if (null == tMonitoringRetrievalPlan.getOrgId()) {
             tMonitoringRetrievalPlan.setOrgId(data.get(0).getId());
         }
@@ -110,7 +111,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         TMonitoringRetrievalPlan tMonitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
         tMonitoringRetrievalPlan.setPlanStatus(0);
         tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
-        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(-1L, SecurityConstants.INNER);
+        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(-MINUS_ONE, SecurityConstants.INNER);
         Integer i = 0;
         for (SysOrg l : list) {
             TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
@@ -130,6 +131,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             monitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
             monitoringRetrievalPlan.setCreateTime(DateUtils.getNowDate());
             monitoringRetrievalPlan.setDescription(tMonitoringRetrievalPlan.getDescription());
+            monitoringRetrievalPlan.setCreateType(1);
             i = tMonitoringRetrievalPlanMapper.insert(monitoringRetrievalPlan);
             if (i < 0) {
                 return i;
@@ -172,6 +174,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         } else {
             tMonitoringRetrievalPlan.setPlanStatus(0);
         }
+        tMonitoringRetrievalPlan.setCreateType(0);
         return tMonitoringRetrievalPlanMapper.insert(tMonitoringRetrievalPlan);
     }
 

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

@@ -21,10 +21,13 @@
                 <result property="updateBy" column="update_by"/>
                 <result property="description" column="description"/>
                 <result property="isDeleted" column="is_deleted"/>
+        <result property="createType" column="create_type"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
     </resultMap>
 
     <sql id="selectTMonitoringRetrievalPlanVo">
-        select id, plan_name, org_id, org_path, org_name, org_type, role_id, plan_cycle, plan_frequency, plan_status, create_time, create_by, update_time, update_by, description, is_deleted
+        select id,create_type,start_time,end_time, plan_name, org_id, org_path, org_name, org_type, role_id, plan_cycle, plan_frequency, plan_status, create_time, create_by, update_time, update_by, description, is_deleted
         from core_monitoring_retrieval_plan
     </sql>
 
@@ -109,6 +112,9 @@
                     </if>
                     <if test="isDeleted != null">is_deleted,
                     </if>
+            <if test="startTime !=null">start_time,</if>
+            <if test="endTime !=null">end_time,</if>
+            <if test="createType !=null">createType,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                     <if test="id != null">#{id},
@@ -143,6 +149,12 @@
                     </if>
                     <if test="isDeleted != null">#{isDeleted},
                     </if>
+            <if test="startTime != null">#{startTime},
+            </if>
+            <if test="endTime != null">#{endTime},
+            </if>
+            <if test="createType != null">#{createType},
+            </if>
         </trim>
     </insert>
 
@@ -194,6 +206,15 @@
                     <if test="isDeleted != null">is_deleted =
                         #{isDeleted},
                     </if>
+            <if test="startTime != null">start_time =
+                #{startTime},
+            </if>
+            <if test="endTime != null">end_time =
+                #{endTime},
+            </if>
+            <if test="createType != null">createType =
+                #{createType},
+            </if>
         </trim>
         where id = #{id}
     </update>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/SocSystemApplication.java

@@ -25,4 +25,5 @@ public class SocSystemApplication
         SpringApplication.run(SocSystemApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  系统模块启动成功   ლ(´ڡ`ლ)ﾞ  ");
     }
+
 }

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

@@ -71,17 +71,16 @@ public class SysDeviceController extends BaseController {
      * 通过机构id查询主机
      */
     @ApiOperation(value = "通过机构id查询主机")
-    @InnerAuth
-    @GetMapping(value = "/getSysDeviceByOrgId")
-    public List<SysDevice> getSysDeviceByOrgId(Long orgId) {
-        return sysDeviceService.getHostByOrgId(orgId);
+    @RequiresPermissions("system:device:query")
+    @GetMapping(value = "/getSysDeviceByOrgId/{orgId}")
+    public AjaxResult getSysDeviceByOrgId(@PathVariable(value = "orgId", required = false)Long orgId) {
+        return success(sysDeviceService.getHostByOrgId(orgId));
     }
 
     @ApiOperation(value = "通过主机查询视频监控")
-    @InnerAuth
-    @GetMapping(value = "/getSysDeviceByHostId")
-    public List<SysDevice> getSysDeviceByHostId(Long hostId) {
-        return sysDeviceService.getSysDeviceByHostId(hostId);
+    @GetMapping(value = "/getSysDeviceByHostId/{hostId}")
+    public AjaxResult getSysDeviceByHostId(@PathVariable(value = "hostId", required = false)Long hostId) {
+        return success(sysDeviceService.getSysDeviceByHostId(hostId));
     }
 
     /**

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

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectRoleVo">
-	    select distinct r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+	    select distinct r.id,r.org_type, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
             r.status, r.del_flag, r.create_time, r.remark 
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.id