Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DeviceHttpController.java

@@ -8,6 +8,7 @@ import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.service.BaseAlarmService;
 import com.usky.iot.service.DmpDataInfoService;
+import com.usky.iot.service.DmpDeviceInfoService;
 import com.usky.iot.service.DmpDeviceStatusService;
 import com.usky.backend.domain.request.DmpDeviceDataRequestVO;
 import com.usky.transfer.RemoteTransferService;
@@ -36,6 +37,9 @@ public class DeviceHttpController {
     @Autowired
     private RemoteTransferService remoteTransferService;
 
+    @Autowired
+    private DmpDeviceInfoService dmpDeviceInfoService;
+
     @GetMapping(value = "/status")
     public ApiResult<Void> status(){
         baseAlarmService.status();
@@ -60,18 +64,11 @@ public class DeviceHttpController {
     public ApiResult<Map<String,Object>> control(@RequestParam("productCode") String productCode,
                                                  @RequestParam("deviceId") String deviceId,
                                                  @RequestParam("commandCode") String commandCode,
-                                                 @RequestParam("commandValue") String commandValue){
-        Integer tenantId = SecurityUtils.getTenantId();
-
-        Map<String,Object> map = new HashMap<>();
-        map.put("method","control");
-        Map<String,Object> map1 = new HashMap<>();
-        map1.put("device_id",deviceId);
-        map1.put("commandCode",commandCode);
-        map1.put("commandValue",commandValue);
-        map.put("params",map1);
-
-        return ApiResult.success(remoteTransferService.deviceControl(productCode,deviceId,JSON.toJSONString(map),tenantId));
+                                                 @RequestParam("commandValue") String commandValue,
+                                                 @RequestParam(value = "domain",required = false) String domain,
+                                                 @RequestParam(value = "userId",required = false) Long userId,
+                                                 @RequestParam(value = "userName",required = false) String userName){
+        return ApiResult.success(dmpDeviceInfoService.control(productCode,deviceId,commandCode,commandValue,domain,userId,userName));
     }
 
 
@@ -92,6 +89,8 @@ public class DeviceHttpController {
                                                          @RequestParam("protocol") String protocol,
                                                          @RequestParam("transmode") Integer transmode){
         Integer tenantId = SecurityUtils.getTenantId();
+        Long userId = SecurityUtils.getUserId();
+        String userName = SecurityUtils.getUsername();
 
         Map<String,Object> map = new HashMap<>();
         map.put("method","streamControl");
@@ -102,7 +101,7 @@ public class DeviceHttpController {
         map1.put("transmode",transmode);
         map.put("params",map1);
 
-        return ApiResult.success(remoteTransferService.deviceControl(productCode,deviceId, JSON.toJSONString(map),tenantId));
+        return ApiResult.success(remoteTransferService.deviceControl(productCode,deviceId, JSON.toJSONString(map),tenantId,userId,userName));
     }
 
     /**
@@ -119,6 +118,8 @@ public class DeviceHttpController {
                                                           @RequestParam(value = "pageNo") Integer pageNo,
                                                           @RequestParam(value = "pageSize") Integer pageSize){
         Integer tenantId = SecurityUtils.getTenantId();
+        Long userId = SecurityUtils.getUserId();
+        String userName = SecurityUtils.getUsername();
 
         Map<String,Object> map = new HashMap<>();
         map.put("method","driverRecordControl");
@@ -133,7 +134,27 @@ public class DeviceHttpController {
         map1.put("pageSize",pageSize);
         map.put("params",map1);
 
-        return ApiResult.success(remoteTransferService.deviceControl("501_HGHK","0001",JSON.toJSONString(map),tenantId));
+        return ApiResult.success(remoteTransferService.deviceControl("501_HGHK","0001",JSON.toJSONString(map),tenantId,userId,userName));
+    }
+
+    /**
+     * 查询停车库剩余车位数
+     * @param parkSyscode
+     * @return
+     */
+    @GetMapping("parkRemainSpaceList")
+    public ApiResult<Map<String,Object>> parkRemainSpaceList(@RequestParam(value = "parkSyscode") String parkSyscode){
+        Integer tenantId = SecurityUtils.getTenantId();
+        Long userId = SecurityUtils.getUserId();
+        String userName = SecurityUtils.getUsername();
+
+        Map<String,Object> map = new HashMap<>();
+        map.put("method","parkRemainSpaceControl");
+        Map<String,Object> map1 = new HashMap<>();
+        map1.put("parkSyscode",parkSyscode);
+        map.put("params",map1);
+
+        return ApiResult.success(remoteTransferService.deviceControl("501_HGHK","0002",JSON.toJSONString(map),tenantId,userId,userName));
     }
 
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceInfoMapper.java

@@ -36,4 +36,6 @@ public interface DmpDeviceInfoMapper extends CrudMapper<DmpDeviceInfo> {
     Integer deviceOfflineCount(@Param("deviceIdList") List<String> deviceIdList);
 
     List<BaseAlarm> baseAlarmList(@Param("deviceIdList") List<String> deviceIdList);
+
+    Integer sysTenantId(@Param("domain") String domain);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceInfoService.java

@@ -7,6 +7,7 @@ import com.usky.iot.domain.DmpDeviceInfo;
 import com.usky.iot.service.vo.BaseFacilityDeviceVO;
 import com.usky.iot.service.vo.DmpDeviceInfoRequest;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -68,4 +69,6 @@ public interface DmpDeviceInfoService extends CrudService<DmpDeviceInfo> {
     List<Map<String,Object>> deviceDataTotal(DataTotalRequestVO requestVO);
     List<DataAverageResponseVO> deviceDataAverage(DataAverageRequestVO requestVO);
     List<DataAverageExportVO> DataAverageExport(DataAverageRequestVO requestVO);
+
+    Map<String,Object> control(String productCode, String deviceId, String commandCode, String commandValue, String domain, Long userId, String userName);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -7,6 +7,7 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -20,6 +21,7 @@ import com.usky.backend.client.DataQueryClient;
 import com.usky.backend.client.DeviceDataClient;
 import com.usky.backend.domain.*;
 import com.usky.backend.domain.response.DataRealTimeResponseVO;
+import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.BeanMapperUtils;
@@ -33,6 +35,7 @@ import com.usky.iot.service.DmpDeviceInfoService;
 import com.usky.iot.service.DmpDeviceStatusService;
 import com.usky.iot.service.DmpProductAttributeService;
 import com.usky.iot.service.vo.*;
+import com.usky.transfer.RemoteTransferService;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -74,6 +77,35 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
     @Autowired
     private DataQueryClient dataQueryClient;
 
+    @Autowired
+    private RemoteTransferService remoteTransferService;
+
+    @Override
+    public Map<String,Object> control(String productCode, String deviceId, String commandCode, String commandValue, String domain, Long userId, String userName){
+        Integer tenantId;
+        long commandUserId;
+        String commandUserName;
+        if(StringUtils.isNotBlank(domain)){
+            tenantId = baseMapper.sysTenantId(domain);
+            commandUserId = userId;
+            commandUserName = userName;
+        }else{
+            tenantId = SecurityUtils.getTenantId();
+            commandUserId = SecurityUtils.getUserId();
+            commandUserName = SecurityUtils.getUsername();
+        }
+
+        Map<String,Object> map = new HashMap<>();
+        map.put("method","control");
+        Map<String,Object> map1 = new HashMap<>();
+        map1.put("device_id",deviceId);
+        map1.put("commandCode",commandCode);
+        map1.put("commandValue",commandValue);
+        map.put("params",map1);
+
+        return remoteTransferService.deviceControl(productCode,deviceId, JSON.toJSONString(map),tenantId,commandUserId,commandUserName);
+    }
+
     @Override
     public void add(DmpDeviceInfo dmpDeviceInfo) {
         if (checkNameUnique(dmpDeviceInfo)){

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceInfoMapper.xml

@@ -104,6 +104,15 @@
             </if>
         </where>
     </select>
+    <select id="sysTenantId" resultType="integer">
+        select id
+        from sys_tenant
+        <where>
+            <if test="1 == 1">
+                and domain = #{domain}
+            </if>
+        </where>
+    </select>
     <select id="deviceOfflineCount" resultType="integer">
         select count(*)
         from dmp_device_status

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingRoomController.java

@@ -49,14 +49,22 @@ public class MeetingRoomController {
     public ApiResult<Map<String,Object>> control(@PathVariable("productCode") String productCode,
                                                  @PathVariable("deviceId") String deviceId,
                                                  @RequestParam(value = "commandStr") String commandStr,
-                                                 @RequestParam(value = "domain",required = false) String domain){
+                                                 @RequestParam(value = "domain",required = false) String domain,
+                                                 @RequestParam(value = "userId",required = false) Long userId,
+                                                 @RequestParam(value = "userName",required = false) String userName){
         Integer tenantId;
+        long commandUserId;
+        String commandUserName;
         if(StringUtils.isNotBlank(domain)){
             tenantId = dmMeetingRoomRepository.getTenantIdByDomain(domain);
+            commandUserId = userId;
+            commandUserName = userName;
         }else{
             tenantId = SecurityUtils.getTenantId();
+            commandUserId = SecurityUtils.getUserId();
+            commandUserName = SecurityUtils.getUsername();
         }
-        return ApiResult.success(remoteTransferService.deviceControl(productCode,deviceId,commandStr,tenantId));
+        return ApiResult.success(remoteTransferService.deviceControl(productCode,deviceId,commandStr,tenantId,commandUserId,commandUserName));
     }
 
     /**