java110 4 lat temu
rodzic
commit
05e6f61184

+ 4 - 0
java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java

@@ -3,6 +3,7 @@ package com.java110.intf.job;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
+import com.java110.dto.machine.MachineDto;
 import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
 import com.java110.entity.order.Business;
 import com.java110.po.machine.MachineRecordPo;
@@ -89,4 +90,7 @@ public interface IDataBusInnerServiceSMO {
 
     @RequestMapping(value = "/customCarInOut", method = RequestMethod.POST)
     ResultVo customCarInOut(@RequestBody JSONObject reqJson);
+
+    @RequestMapping(value = "/payVideo", method = RequestMethod.POST)
+    ResultVo payVideo(@RequestBody MachineDto machineDto);
 }

+ 76 - 0
service-common/src/main/java/com/java110/common/cmd/machine/PlayCameraCmd.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.common.cmd.machine;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.machine.MachineDto;
+import com.java110.intf.common.IMachineInnerServiceSMO;
+import com.java110.intf.job.IDataBusInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * 类表述:摄像头播放
+ * 服务编码:machine.openParkingAreaDoorControlLog
+ * 请求路劲:/app/machine.openParkingAreaDoorControlLog
+ * add by 吴学文 at 2021-09-18 13:35:13 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "machine.playCameraCmd")
+public class PlayCameraCmd extends AbstractServiceCmdListener {
+
+    private static Logger logger = LoggerFactory.getLogger(PlayCameraCmd.class);
+
+    @Autowired
+    private IMachineInnerServiceSMO machineInnerServiceSMOImpl;
+
+    @Autowired
+    IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "machineId", "未包含摄像头");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        MachineDto machineDto = BeanConvertUtil.covertBean(reqJson, MachineDto.class);
+        List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
+
+        Assert.listOnlyOne(machineDtos, "未包含 摄像头");
+
+        JSONObject data = dataBusInnerServiceSMOImpl.payVideo(machineDtos.get(0));
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(data));
+    }
+}

+ 7 - 0
service-job/src/main/java/com/java110/job/adapt/DatabusAdaptImpl.java

@@ -18,6 +18,7 @@ package com.java110.job.adapt;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.client.RestTemplate;
 import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
+import com.java110.dto.machine.MachineDto;
 import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
 import com.java110.entity.order.Business;
 import com.java110.job.adapt.hcIot.GetToken;
@@ -66,6 +67,12 @@ public abstract class DatabusAdaptImpl implements IDatabusAdapt {
         return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
     }
 
+    @Override
+    public ResultVo payVideo(MachineDto machineDto) {
+        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
+    }
+
+
     /**
      * 重启设备
      *

+ 3 - 0
service-job/src/main/java/com/java110/job/adapt/IDatabusAdapt.java

@@ -17,6 +17,7 @@ package com.java110.job.adapt;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
+import com.java110.dto.machine.MachineDto;
 import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
 import com.java110.entity.order.Business;
 import com.java110.po.machine.MachineRecordPo;
@@ -71,4 +72,6 @@ public interface IDatabusAdapt {
     void customExchange(CustomBusinessDatabusDto customBusinessDatabusDto);
 
     ResultVo customCarInOut(JSONObject reqJson);
+
+    ResultVo payVideo(MachineDto machineDto);
 }

+ 19 - 0
service-job/src/main/java/com/java110/job/adapt/hcIot/OpenDoorAdapt.java

@@ -172,4 +172,23 @@ public class OpenDoorAdapt extends DatabusAdaptImpl {
 
     }
 
+    @Override
+    public ResultVo payVideo(MachineDto machineDto) {
+
+//        JSONObject postParameters = new JSONObject();
+//        postParameters.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+//        postParameters.put("extMachineId", paramIn.getString("machineId"));
+//        postParameters.put("carNum", paramIn.getString("carNum"));
+//        postParameters.put("type", paramIn.getString("type"));
+//        postParameters.put("amount", paramIn.getString("amount"));
+//        postParameters.put("payCharge", paramIn.getString("payCharge"));
+//        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders(outRestTemplate));
+//        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.CUSTOM_CAR_INOUT), HttpMethod.POST, httpEntity, String.class);
+//        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+//            return new ResultVo(ResultVo.CODE_ERROR, responseEntity.getBody());
+//        }
+//        JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+        JSONObject paramOut = new JSONObject();
+        return new ResultVo(paramOut.getInteger("code"), paramOut.getString("msg"));
+    }
 }

+ 7 - 0
service-job/src/main/java/com/java110/job/smo/impl/DataBusInnerServiceSMOImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.businessDatabus.BusinessDatabusDto;
 import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
+import com.java110.dto.machine.MachineDto;
 import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
 import com.java110.entity.order.Business;
 import com.java110.intf.job.IDataBusInnerServiceSMO;
@@ -69,6 +70,12 @@ public class DataBusInnerServiceSMOImpl extends BaseServiceSMO implements IDataB
         return databusAdaptImpl.customCarInOut(reqJson);
     }
 
+    @Override
+    public ResultVo payVideo(@RequestBody MachineDto machineDto) {
+        IDatabusAdapt databusAdaptImpl = ApplicationContextFactory.getBean(DEFAULT_OPEN_DOOR_PROTOCOL, IDatabusAdapt.class);
+        return databusAdaptImpl.payVideo(machineDto);
+    }
+
     @Override
     public ResultVo restartMachine(@RequestBody JSONObject reqJson) {
         IDatabusAdapt databusAdaptImpl = ApplicationContextFactory.getBean(DEFAULT_START_MACHINE_PROTOCOL, IDatabusAdapt.class);

+ 2 - 2
service-user/src/main/resources/dataSource-zihao.yml

@@ -1,7 +1,7 @@
 dataSources:
   ds0: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
     username: hc_community
     password: ${mysqlpwd}
     minIdle: 5
@@ -22,7 +22,7 @@ dataSources:
 #    maintenanceIntervalMilliseconds: 30000
   ds1: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
     username: TT
     password: ${mysqlpwd}
     minIdle: 5

+ 2 - 2
service-user/src/main/resources/dataSource.yml

@@ -1,7 +1,7 @@
 dataSources:
   ds0: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
     username: hc_community
     password: hc_community@12345678
     minIdle: 5
@@ -22,7 +22,7 @@ dataSources:
 #    maintenanceIntervalMilliseconds: 30000
   ds1: !!com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
     username: TT
     password: TT@12345678
     minIdle: 5