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

project_data/sql/0.0.5/soc/soc.sql

@@ -127,6 +127,9 @@ VALUES (01719892877586239490, '外包履职评价统计表', 1719287834364436482
 
 
 UPDATE sys_menu set menu_type='C',perms='appquestion:list' WHERE platform_type=0 and menu_name='隐患问题清单';
+delete from sys_dict_data where dict_type='register_book_type' and dict_value='28';
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
+ VALUES (28, '监控调阅登记簿', '28', 'register_book_type', null, 'default', 'N', '0', null, now(), null, now(), null);
 
 DELETE from `sys_dict_type`  WHERE `dict_type`='app_question_status';
 DELETE from `sys_dict_data`  WHERE `dict_type`='app_question_status';

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

@@ -89,7 +89,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     @Autowired
     private RemoteFileService fileService;
     @Autowired
-private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
+    private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
+
     @Override
     public TableDataInfo selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         //未删除
@@ -130,16 +131,11 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
         page.getRecords().forEach(p -> {
             boolean isComplete = this.getIsComplete(p.getId());
             p.setIsComplete(isComplete);
-       /*     if (p.getPlanStatus()==1||isComplete==false){
-                p.setIsEdit(true);
-            }*/
         });
         return TableDataInfo.build(page);
     }
 
 
-
-
     /**
      * 查询监控调阅计划
      *
@@ -178,6 +174,13 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
         if (plan.getPlanStatus() == 0) {
             isComplete = false;
         }
+        //是否有任务
+        boolean haveTask = false;
+        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks1 = coreMonitoringRetrievalTaskMapper.selectAllTaskAndSonByPlanId(id);
+        if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks1)) {
+            haveTask = true;
+        }
+        tMonitoringRetrievalPlanVO.setIsHaveTask(haveTask);
         tMonitoringRetrievalPlanVO.setIsComplete(isComplete);
         return tMonitoringRetrievalPlanVO;
     }
@@ -719,22 +722,8 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
         return tMonitoringRetrievalPlanMapper.insert(tMonitoringRetrievalPlan);
     }
 
-    /**
-     * 修改监控调阅计划
-     *
-     * @param tMonitoringRetrievalPlan 监控调阅计划
-     * @return 结果
-     */
-    @Transactional
-    @Override
-    public int updateTMonitoringRetrievalPlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
-        boolean isComplete = getIsComplete(tMonitoringRetrievalPlan.getId());
-        //如果计划下面的任务都是没完成就删除所有任务，有完成就只修改
-        TMonitoringRetrievalPlan plan = baseMapper.selectById(tMonitoringRetrievalPlan.getId());
-        BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);
-        SysRole sysRole = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
-        plan.setRoleName(sysRole.getRoleName());
-        int i = tMonitoringRetrievalPlanMapper.updateById(plan);
+    @Async
+    public void updateComplete(boolean isComplete, TMonitoringRetrievalPlan tMonitoringRetrievalPlan, TMonitoringRetrievalPlan plan) {
         if (isComplete) {
             coreMonitoringRetrievalTaskBuilderService.deleteWaitTaskByPlanId(tMonitoringRetrievalPlan.getId());
             try {
@@ -820,6 +809,28 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
                 e.getMessage();
             }
         }
+    }
+
+    /**
+     * 修改监控调阅计划
+     *
+     * @param tMonitoringRetrievalPlan 监控调阅计划
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateTMonitoringRetrievalPlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
+        long l = System.currentTimeMillis();
+        boolean isComplete = getIsComplete(tMonitoringRetrievalPlan.getId());
+        //如果计划下面的任务都是没完成就删除所有任务，有完成就只修改
+        TMonitoringRetrievalPlan plan = baseMapper.selectById(tMonitoringRetrievalPlan.getId());
+        BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);
+        SysRole sysRole = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
+        plan.setRoleName(sysRole.getRoleName());
+        int i = tMonitoringRetrievalPlanMapper.updateById(plan);
+        this.updateComplete(isComplete, tMonitoringRetrievalPlan, plan);
+        long l1 = System.currentTimeMillis();
+        System.out.print(l1-l);
         return i;
     }
 
@@ -886,19 +897,21 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
     public String createAccessPdfNow(AccessPdf data) {
         return buildAccessPdfData(data);
     }
+
     @Async
     @Override
     public void buildPdf(Long taskId) {
         AccessPdfVO accessPdfVO = baseMapper.selectTask(taskId);
         createSafetyCheckRegisterBookPdf(accessPdfVO);
     }
+
     @Override
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
     public String createSafetyCheckRegisterBookPdf(AccessPdfVO accessPdfVO) {
         AccessPdf accessPdf = buildSafetyCheckRegisterBookData(accessPdfVO);
         String url = this.createAccessPdfNow(accessPdf);
-        CoreRegisterBookPdf registerBookPdf=new CoreRegisterBookPdf();
-      //  registerBookPdf.setId(appSafetyCheckTask.getId());
+        CoreRegisterBookPdf registerBookPdf = new CoreRegisterBookPdf();
+        //  registerBookPdf.setId(appSafetyCheckTask.getId());
         registerBookPdf.setRegisterBookType(RegisterBookType.MONITOR_ACCESS.getNum());
         registerBookPdf.setDate(new Date());
         SysOrg org = remoteOrgService.selectSysOrgById(accessPdf.getOrgId(), SecurityConstants.INNER);
@@ -918,12 +931,13 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
         coreMonitoringRetrievalTaskMapper.updateCoreMonitoringRetrievalTask(tem);
         return url;
     }
+
     public AccessPdf buildSafetyCheckRegisterBookData(AccessPdfVO accessPdfVO) {
         AccessPdf accessPdf = new AccessPdf();
         accessPdf.setTaskTitle("标题");
         final SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分");
-       Calendar calendar=Calendar.getInstance();
-        String dateStr = format.format(accessPdfVO.getTaskStartTime())+"-"+calendar.get(Calendar.HOUR_OF_DAY)+"时"+calendar.get(Calendar.MINUTE)+"分";
+        Calendar calendar = Calendar.getInstance();
+        String dateStr = format.format(accessPdfVO.getTaskStartTime()) + "-" + calendar.get(Calendar.HOUR_OF_DAY) + "时" + calendar.get(Calendar.MINUTE) + "分";
         accessPdf.setTaskStartTime(dateStr);
         accessPdf.setCheckUser(accessPdfVO.getCheckUser());
         accessPdf.setOrgId(accessPdfVO.getOrgId());

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

@@ -19,5 +19,6 @@ public class TMonitoringRetrievalPlanVO extends TMonitoringRetrievalPlan {
     private Boolean isComplete;
     @ApiModelProperty(value = "父类调阅频次")
     private Long parentFrequency;
-
+    @ApiModelProperty(value = "是否有任务")
+    private Boolean isHaveTask;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -108,14 +108,17 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
      * @param planId
      */
     void deleteAllTaskByPlanId(@Param("planId") Long planId);
-    void deleteTaskByStartTime(@Param("planId") Long planId,@Param("endTime") String endTime);
+
+    void deleteTaskByStartTime(@Param("planId") Long planId, @Param("endTime") String endTime);
 
     void deleteAllTaskByPlanIds(@Param("planIds") Long[] planIds);
 
     void deleteDayTaskByTime(@Param("planId") Long planId, @Param("cycle") String cycle, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     void deleteDayTaskByTimeAndPlanId(@Param("planId") Long planId, @Param("cycle") String cycle, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
-    void deleteTaskByToday(@Param("planId") Long planId,@Param("day") String day);
+
+    void deleteTaskByToday(@Param("planId") Long planId, @Param("day") String day);
+
     /**
      * 删除周任务
      *
@@ -135,7 +138,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
      */
     void deleteDayTaskByPlanId(@Param("planId") Long planId, @Param("cycle") String cycle, @Param("ymdDate") String ymdDate);
 
-    List<CoreMonitoringRetrievalTask> selectAllTaskByPlanId(@Param("planIds") Long[] planIds,@Param("statusList") String[] statusList);
+    List<CoreMonitoringRetrievalTask> selectAllTaskByPlanId(@Param("planIds") Long[] planIds, @Param("statusList") String[] statusList);
 
     /**
      * 删除月任务
@@ -165,6 +168,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
      */
     List<CoreMonitoringRetrievalTask> selectCompleteByPlanId(Long planId);
 
+    List<CoreMonitoringRetrievalTask> selectAllTaskAndSonByPlanId(Long planId);
 
     void deleteWaitTaskByPlanId(@Param("planId") Long planId);
 
@@ -190,7 +194,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
 
 
     int saveMonitorExceptionData(@Param("year") int year, @Param("quarter") int quarter, @Param("month") int month,
-                                    @Param("roleId") Long roleId, @Param("orgIds") List<Long> orgIds);
+                                 @Param("roleId") Long roleId, @Param("orgIds") List<Long> orgIds);
 
     List<CoreMonitoringRetrievalTask> selectTaskByIdList(@Param("list") List<String> list);
 

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

@@ -815,4 +815,25 @@
         </foreach>
         order by plan_start_time desc
     </select>
+    <select id="selectAllTaskAndSonByPlanId"
+            resultType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
+        SELECT
+            *
+        FROM
+            core_monitoring_retrieval_task
+        WHERE
+                plan_id IN (
+                SELECT
+                    id
+                FROM
+                    (
+                        SELECT
+                            id
+                        FROM
+                            core_monitoring_retrieval_plan
+                        WHERE
+                            id = #{planId}
+
+                           OR parent_id = #{planId}) b)
+    </select>
 </mapper>

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

@@ -121,14 +121,9 @@ public class SysAreaCheckController extends BaseController {
     }
 
     @ApiOperation(value = "获取SysNfcBind通过机构id")
-
     @GetMapping(value = "/getAreaCheckInfoByOrg/{orgId}")
     public AjaxResult getAreaCheckInfoByOrg(@PathVariable(value = "orgId", required = false) Long orgId) {
         AjaxResult ajax = AjaxResult.success();
-   /*     SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
-        if (null == sysOrg.getType()) {
-            return error("该机构没有机构类型，请维护！");
-        }*/
         List<SysAreaCheck> sysAreaChecks = sysAreaCheckService.selectByOrgId(orgId);
         ajax.put(AjaxResult.DATA_TAG, sysAreaChecks);
         return ajax;

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

@@ -63,13 +63,8 @@ public class SysAreaController extends BaseController {
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation(value = "根据机构获取区域")
-
     @GetMapping("/getAreaByOrg/{orgId}")
     public AjaxResult getAreaByOrg(@PathVariable("orgId") Long orgId) {
- /*       SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
-        if (null==sysOrg.getType()){
-         return error("该机构没有机构类型，请维护！");
-        }*/
         return success(sysAreaService.getAreaByOrg(orgId));
     }
     /**