1、小程序长者端-审核界面排序

2、pad服务指令手动拍照/录像:子表数据处理

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java

@@ -61,8 +61,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
+
     /**
      * 获取摄像头信息-分页
+     *
      * @param page
      * @param cameraInfo
      * @return
@@ -84,6 +86,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取所有摄像头信息
+     *
      * @return
      */
     public List<CameraInfo> findAllList() {
@@ -92,6 +95,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取护理单元信息
+     *
      * @return
      */
     public IPage<CameraInfo> findNuPage(Page<CameraInfo> page, CameraInfo cameraInfo) {
@@ -100,6 +104,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 调用接口-修改tums摄像头名称
+     *
      * @param cameraInfo
      * @return
      */
@@ -121,6 +126,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 修改摄像头设备信息
+     *
      * @param cameraInfo
      * @return
      */
@@ -132,6 +138,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 调用接口-重启摄像头设备
+     *
      * @param cameraInfo
      * @return
      */
@@ -166,6 +173,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 重启摄像头设备
+     *
      * @param cameraInfo
      * @return
      */
@@ -176,6 +184,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 同步摄像头设备信息入库
+     *
      * @param jsonResponse
      * @return
      */
@@ -210,6 +219,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 同步摄像头设备能力集入库
+     *
      * @param deviceIndex
      * @param jsonResponse
      * @return
@@ -241,6 +251,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 接口调用-获取摄像头能力集
+     *
      * @param cameraInfo
      * @return
      */
@@ -303,6 +314,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 同步IPC设备信息入库
+     *
      * @param jsonResponse
      * @return
      */
@@ -338,6 +350,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 同步IPC设备能力集入库
+     *
      * @param cameraInfo
      * @return
      */
@@ -373,6 +386,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 更新设备在线状态
+     *
      * @param deviceIndex
      * @param errCode
      */
@@ -1088,6 +1102,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
     /**
      * 获取摄像头实时播放地址
      * 添加预览通道
+     *
      * @param cameraInfo
      * @return
      */
@@ -1118,6 +1133,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
     /**
      * 获取摄像头实时播放地址
      * 获取预览通道的url
+     *
      * @param id
      * @param streamType
      * @param sessionId
@@ -2050,6 +2066,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 搜索存在回放录像的日期-预留
+     *
      * @param videoDevId,year
      * @return
      */
@@ -2223,6 +2240,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取指定监控点的存储设备列表
+     *
      * @param cameraInfo
      * @return
      */
@@ -2289,6 +2307,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 添加回放通道V2
+     *
      * @param cameraInfo
      * @return
      */
@@ -2348,6 +2367,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取回放通道的url
+     *
      * @param cameraInfo
      * @return
      */
@@ -2497,6 +2517,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 删除某一回放通道
+     *
      * @param videoDevId
      * @param sessionId
      */
@@ -2601,6 +2622,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取nvmp设备双向通信URL
+     *
      * @param cameraInfo
      * @return
      */
@@ -2654,6 +2676,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取nvmp设备双向通信URL
+     *
      * @param cameraInfo
      * @return
      */
@@ -2683,6 +2706,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 回放视频转mp4上传
+     *
      * @param cameraInfo
      * @return
      */
@@ -2764,6 +2788,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 停止转存MP4上传任务
+     *
      * @param cameraInfo
      * @return
      */
@@ -2793,6 +2818,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取转存MP4上传任务进度
+     *
      * @param cameraInfo
      * @return
      */
@@ -2827,6 +2853,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 高速球机移动方向控制
+     *
      * @param cameraInfo
      * @return
      */
@@ -2878,6 +2905,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 下载tplink自定义录像
+     *
      * @param nuId
      * @param startTime
      * @param endTime
@@ -2902,7 +2930,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         cameraInfo.setParentId(tplinkInfo.getParentId());
         cameraInfo.setFileName(fileName);
         cameraInfo.setVideoType("1");
-        cameraInfo.setFtpUploadpath("/upFiles101/"+year+month+day+"/fwxm/tplinkVideo");
+        cameraInfo.setFtpUploadpath(uploadpath + "/" + year + month + day + "/fwxm/tplinkVideo");
         cameraInfo.setStartTime(startTime);
         cameraInfo.setEndTime(endTime);
         try {
@@ -2916,6 +2944,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 回放视频转mp4上传
+     *
      * @param cameraInfo
      * @return
      */

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java

@@ -74,8 +74,7 @@ public class DirectiveAppraisalController extends JeecgController<DirectiveAppra
         Page<DirectiveAppraisal> page = new Page<DirectiveAppraisal>(pageNo, pageSize);
 
         //排序：先撤回的放前面 再是未考核的 再是应该执行时间倒序
-        queryWrapper.orderByAsc("CASE WHEN revocation IS NOT NULL AND revocation != '' THEN 0 ELSE 1 END");
+        queryWrapper.orderByAsc("CASE WHEN status = 4 THEN 0 WHEN status = 1 THEN 1 WHEN status = 2 THEN 999 WHEN status = 3 THEN 999 ELSE 999 END");
-        queryWrapper.orderByAsc("CASE WHEN status = 0 THEN 0 ELSE 1 END");
         queryWrapper.orderByDesc("start_time");
 
         IPage<DirectiveAppraisal> pageList = directiveAppraisalService.page(page, queryWrapper);

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java

@@ -14,6 +14,7 @@ import com.nu.modules.biz.order.entity.DirectiveOrderInfo;
 import com.nu.modules.biz.order.mapper.DirectiveOrderBizLogMapper;
 import com.nu.modules.biz.order.mapper.DirectiveOrderMapper;
 import com.nu.modules.biz.order.mapper.DirectiveOrderInfoMapper;
+import com.nu.modules.biz.order.service.IDirectiveOrderInfoService;
 import com.nu.modules.biz.order.service.IDirectiveOrderService;
 import com.nu.modules.directiveorder.api.IDirectiveOrderLogApi;
 import com.nu.modules.order.api.IDirectiveOrderApi;
@@ -49,6 +50,8 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
     private DirectiveOrderBizLogMapper directiveOrderBizLogMapper;
     @Autowired
     private IDirectiveOrderLogApi directiveOrderLogApi;
+    @Autowired
+    private IDirectiveOrderInfoService directiveOrderInfoService;
 
     @Override
     public List<DirectiveOrderInfoEntity> queryList(DirectiveOrderInfoEntity dto) {
@@ -208,10 +211,19 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
 
     @Override
     public Map<String, Object> editSubMp4(DirectiveOrderEntity directiveOrderEntity) {
+        //主表
         DirectiveOrder directiveOrder = new DirectiveOrder();
         directiveOrder.setId(directiveOrderEntity.getId());
         directiveOrder.setManuallyMp4Path(directiveOrderEntity.getManuallyMp4Path());
         directiveOrderService.updateById(directiveOrder);
+
+        //子表
+        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
+        directiveOrderInfo.setManuallyMp4Path(directiveOrderEntity.getManuallyMp4Path());
+        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
+        uw.eq("main_id",directiveOrderEntity.getId());
+        directiveOrderInfoService.update(directiveOrderInfo,uw);
+
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "操作成功");
@@ -220,10 +232,19 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
 
     @Override
     public Map<String, Object> editSubPicPath(DirectiveOrderEntity directiveOrderEntity) {
+        //主表
         DirectiveOrder directiveOrder = new DirectiveOrder();
         directiveOrder.setId(directiveOrderEntity.getId());
         directiveOrder.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath());
         directiveOrderService.updateById(directiveOrder);
+
+        //子表
+        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
+        directiveOrderInfo.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath());
+        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
+        uw.eq("main_id",directiveOrderEntity.getId());
+        directiveOrderInfoService.update(directiveOrderInfo,uw);
+
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "操作成功");