加入电梯相机功能，支持电梯非机动车检车

service-common/src/main/java/com/java110/common/cmd/meterMachine/ListMeterMachineCmd.java

@@ -1,144 +0,0 @@
-/*
- * 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.meterMachine;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.common.smartMeter.ISmartMeterCoreRead;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.meter.MeterMachineSpecDto;
-import com.java110.intf.common.IMeterMachineSpecV1InnerServiceSMO;
-import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
-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.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.meter.MeterMachineDto;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * 类表述：查询
- * 服务编码：meterMachine.listMeterMachine
- * 请求路劲：/app/meterMachine.ListMeterMachine
- * add by 吴学文 at 2023-02-22 22:32: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 = "meterMachine.listMeterMachine")
-public class ListMeterMachineCmd extends Cmd {
-
-    private static Logger logger = LoggerFactory.getLogger(ListMeterMachineCmd.class);
-    @Autowired
-    private IMeterMachineV1InnerServiceSMO meterMachineV1InnerServiceSMOImpl;
-
-    @Autowired
-    private IMeterMachineSpecV1InnerServiceSMO meterMachineSpecV1InnerServiceSMOImpl;
-
-    @Autowired
-    private ISmartMeterCoreRead smartMeterCoreReadImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
-    }
-
-    @Override
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        MeterMachineDto meterMachineDto = BeanConvertUtil.covertBean(reqJson, MeterMachineDto.class);
-
-        int count = meterMachineV1InnerServiceSMOImpl.queryMeterMachinesCount(meterMachineDto);
-
-        List<MeterMachineDto> meterMachineDtos = null;
-
-        if (count > 0) {
-            meterMachineDtos = meterMachineV1InnerServiceSMOImpl.queryMeterMachines(meterMachineDto);
-            freshSpecs(meterMachineDtos);
-            queryMeterMachineDegree(meterMachineDtos);
-        } else {
-            meterMachineDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, meterMachineDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        cmdDataFlowContext.setResponseEntity(responseEntity);
-    }
-
-    private void queryMeterMachineDegree(List<MeterMachineDto> meterMachineDtos) {
-        if (meterMachineDtos == null || meterMachineDtos.size() != 1) {
-            return;
-        }
-
-        if (!MeterMachineDto.MACHINE_MODEL_RECHARGE.equals(meterMachineDtos.get(0).getMachineModel())) {
-            return;
-        }
-
-        double degree = smartMeterCoreReadImpl.getMeterDegree(meterMachineDtos.get(0));
-        meterMachineDtos.get(0).setDegree(degree + "");
-    }
-
-    /**
-     * 刷入配置
-     *
-     * @param meterMachineDtos
-     */
-    private void freshSpecs(List<MeterMachineDto> meterMachineDtos) {
-
-        if (meterMachineDtos == null || meterMachineDtos.size() < 1) {
-            return;
-        }
-
-        List<String> machineIds = new ArrayList<>();
-        for (MeterMachineDto meterMachineDto : meterMachineDtos) {
-            machineIds.add(meterMachineDto.getMachineId());
-        }
-
-        MeterMachineSpecDto meterMachineSpecDto = new MeterMachineSpecDto();
-        meterMachineSpecDto.setMachineIds(machineIds.toArray(new String[machineIds.size()]));
-
-        List<MeterMachineSpecDto> meterMachineSpecDtos = meterMachineSpecV1InnerServiceSMOImpl.queryMeterMachineSpecs(meterMachineSpecDto);
-
-        if (meterMachineSpecDtos == null || meterMachineSpecDtos.size() < 1) {
-            return;
-        }
-        List<MeterMachineSpecDto> specs = null;
-        for (MeterMachineDto meterMachineDto : meterMachineDtos) {
-            specs = new ArrayList<>();
-            for (MeterMachineSpecDto tmpMeterMachineFactorySpecDto : meterMachineSpecDtos) {
-                if (meterMachineDto.getMachineId().equals(tmpMeterMachineFactorySpecDto.getMachineId())) {
-                    specs.add(tmpMeterMachineFactorySpecDto);
-                }
-            }
-            meterMachineDto.setSpecs(specs);
-        }
-    }
-}

service-job/src/main/java/com/java110/job/cmd/meterMachine/ListMeterMachineCmd.java

@@ -0,0 +1,71 @@
+/*
+ * 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.job.cmd.meterMachine;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.job.adapt.hcIotNew.http.ISendIot;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述：查询
+ * 服务编码：meterMachine.listMeterMachine
+ * 请求路劲：/app/meterMachine.ListMeterMachine
+ * add by 吴学文 at 2023-02-22 22:32: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 = "meterMachine.listMeterMachine")
+public class ListMeterMachineCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(ListMeterMachineCmd.class);
+
+    @Autowired
+    private ISendIot sendIotImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
+        Assert.hasKeyAndValue(reqJson, "roomId", "未包含房屋");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+
+        reqJson.put("iotApiCode", "listMeterMachineBmoImpl");
+
+        ResultVo resultVo = sendIotImpl.post("/iot/api/common.openCommonApi", reqJson);
+
+        if (resultVo.getCode() != ResultVo.CODE_OK) {
+            throw new CmdException(resultVo.getMsg());
+        }
+        context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
+    }
+}

service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java

@@ -124,7 +124,7 @@ public class OwnerUserLoginCmd extends Cmd {
             userDtos = ifOwnerLoginByPhone(reqJson, context);
         }
         if (ListUtil.isNull(userDtos)) {
-            throw new CmdException("用户不存在，请先注册");
+            throw new CmdException("密码错误或者用户不存在");
         }
 
         // todo  2.0 校验 业主用户绑定表是否存在记录