加入设备台账

java110-bean/src/main/java/com/java110/dto/equipmentAccount/EquipmentAccountDto.java

@@ -0,0 +1,353 @@
+package com.java110.dto.equipmentAccount;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 设备台账数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class EquipmentAccountDto extends PageDto implements Serializable {
+
+    private String useOrgName;
+    private String locationTypeCd;
+    private String remark;
+    private String purchasePrice;
+    private String chargeOrgName;
+    private String machineName;
+    private String chargeOrgId;
+    private String locationDetail;
+    private String firstEnableTime;
+    private String warrantyDeadline;
+    private String model;
+    private String state;
+    private String communityId;
+    private String brand;
+    private String machineTypeCd;
+    private String machineCode;
+    private String useUserName;
+    private String importanceLevel;
+    private String useOrgId;
+    private String useUseTel;
+    private String machineVersion;
+    private String chargeUseName;
+    private String usefulLife;
+    private String machineId;
+    private String chargeUseId;
+    private String netWorth;
+    private String chargeOrgTel;
+    private String typeId;
+    private String machineTypeName;
+    private String locationObjId;
+    private String locationObjName;
+    private String useUserId;
+    private String stateName;
+    private String levelName;
+    private String []machineIds;
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getUseOrgName() {
+        return useOrgName;
+    }
+
+    public void setUseOrgName(String useOrgName) {
+        this.useOrgName = useOrgName;
+    }
+
+    public String getLocationTypeCd() {
+        return locationTypeCd;
+    }
+
+    public void setLocationTypeCd(String locationTypeCd) {
+        this.locationTypeCd = locationTypeCd;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getPurchasePrice() {
+        return purchasePrice;
+    }
+
+    public void setPurchasePrice(String purchasePrice) {
+        this.purchasePrice = purchasePrice;
+    }
+
+    public String getChargeOrgName() {
+        return chargeOrgName;
+    }
+
+    public void setChargeOrgName(String chargeOrgName) {
+        this.chargeOrgName = chargeOrgName;
+    }
+
+    public String getMachineName() {
+        return machineName;
+    }
+
+    public void setMachineName(String machineName) {
+        this.machineName = machineName;
+    }
+
+    public String getChargeOrgId() {
+        return chargeOrgId;
+    }
+
+    public void setChargeOrgId(String chargeOrgId) {
+        this.chargeOrgId = chargeOrgId;
+    }
+
+    public String getLocationDetail() {
+        return locationDetail;
+    }
+
+    public void setLocationDetail(String locationDetail) {
+        this.locationDetail = locationDetail;
+    }
+
+    public String getFirstEnableTime() {
+        return firstEnableTime;
+    }
+
+    public void setFirstEnableTime(String firstEnableTime) {
+        this.firstEnableTime = firstEnableTime;
+    }
+
+    public String getWarrantyDeadline() {
+        return warrantyDeadline;
+    }
+
+    public void setWarrantyDeadline(String warrantyDeadline) {
+        this.warrantyDeadline = warrantyDeadline;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getMachineTypeCd() {
+        return machineTypeCd;
+    }
+
+    public void setMachineTypeCd(String machineTypeCd) {
+        this.machineTypeCd = machineTypeCd;
+    }
+
+    public String getMachineCode() {
+        return machineCode;
+    }
+
+    public void setMachineCode(String machineCode) {
+        this.machineCode = machineCode;
+    }
+
+    public String getUseUserName() {
+        return useUserName;
+    }
+
+    public void setUseUserName(String useUserName) {
+        this.useUserName = useUserName;
+    }
+
+    public String getImportanceLevel() {
+        return importanceLevel;
+    }
+
+    public void setImportanceLevel(String importanceLevel) {
+        this.importanceLevel = importanceLevel;
+    }
+
+    public String getUseOrgId() {
+        return useOrgId;
+    }
+
+    public void setUseOrgId(String useOrgId) {
+        this.useOrgId = useOrgId;
+    }
+
+    public String getUseUseTel() {
+        return useUseTel;
+    }
+
+    public void setUseUseTel(String useUseTel) {
+        this.useUseTel = useUseTel;
+    }
+
+    public String getMachineVersion() {
+        return machineVersion;
+    }
+
+    public void setMachineVersion(String machineVersion) {
+        this.machineVersion = machineVersion;
+    }
+
+    public String getChargeUseName() {
+        return chargeUseName;
+    }
+
+    public void setChargeUseName(String chargeUseName) {
+        this.chargeUseName = chargeUseName;
+    }
+
+    public String getUsefulLife() {
+        return usefulLife;
+    }
+
+    public void setUsefulLife(String usefulLife) {
+        this.usefulLife = usefulLife;
+    }
+
+    public String getMachineId() {
+        return machineId;
+    }
+
+    public void setMachineId(String machineId) {
+        this.machineId = machineId;
+    }
+
+    public String getChargeUseId() {
+        return chargeUseId;
+    }
+
+    public void setChargeUseId(String chargeUseId) {
+        this.chargeUseId = chargeUseId;
+    }
+
+    public String getNetWorth() {
+        return netWorth;
+    }
+
+    public void setNetWorth(String netWorth) {
+        this.netWorth = netWorth;
+    }
+
+    public String getChargeOrgTel() {
+        return chargeOrgTel;
+    }
+
+    public void setChargeOrgTel(String chargeOrgTel) {
+        this.chargeOrgTel = chargeOrgTel;
+    }
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getLocationObjId() {
+        return locationObjId;
+    }
+
+    public void setLocationObjId(String locationObjId) {
+        this.locationObjId = locationObjId;
+    }
+
+    public String getUseUserId() {
+        return useUserId;
+    }
+
+    public void setUseUserId(String useUserId) {
+        this.useUserId = useUserId;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getLocationObjName() {
+        return locationObjName;
+    }
+
+    public void setLocationObjName(String locationObjName) {
+        this.locationObjName = locationObjName;
+    }
+
+    public String[] getMachineIds() {
+        return machineIds;
+    }
+
+    public void setMachineIds(String[] machineIds) {
+        this.machineIds = machineIds;
+    }
+
+    public String getMachineTypeName() {
+        return machineTypeName;
+    }
+
+    public void setMachineTypeName(String machineTypeName) {
+        this.machineTypeName = machineTypeName;
+    }
+}

java110-bean/src/main/java/com/java110/dto/equipmentOperatingLog/EquipmentOperatingLogDto.java

@@ -0,0 +1,122 @@
+package com.java110.dto.equipmentOperatingLog;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 设备操作记录数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class EquipmentOperatingLogDto extends PageDto implements Serializable {
+
+    private String operatingCode;
+    private String machineId;
+    private String operatingId;
+    private String remark;
+    private String communityId;
+    private String operatingDescriptor;
+    private String userName;
+    private String userId;
+    private String useTel;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getOperatingCode() {
+        return operatingCode;
+    }
+
+    public void setOperatingCode(String operatingCode) {
+        this.operatingCode = operatingCode;
+    }
+
+    public String getMachineId() {
+        return machineId;
+    }
+
+    public void setMachineId(String machineId) {
+        this.machineId = machineId;
+    }
+
+    public String getOperatingId() {
+        return operatingId;
+    }
+
+    public void setOperatingId(String operatingId) {
+        this.operatingId = operatingId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getOperatingDescriptor() {
+        return operatingDescriptor;
+    }
+
+    public void setOperatingDescriptor(String operatingDescriptor) {
+        this.operatingDescriptor = operatingDescriptor;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUseTel() {
+        return useTel;
+    }
+
+    public void setUseTel(String useTel) {
+        this.useTel = useTel;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/po/equipmentAccount/EquipmentAccountPo.java

@@ -0,0 +1,327 @@
+/*
+ * 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.po.equipmentAccount;
+
+import java.io.Serializable;
+
+/**
+ * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2022-09-10 20:37:25 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行
+ */
+public class EquipmentAccountPo implements Serializable {
+
+    private String useOrgName;
+    private String locationTypeCd;
+    private String remark;
+    private String purchasePrice;
+    private String chargeOrgName;
+    private String machineName;
+    private String chargeOrgId;
+    private String locationDetail;
+    private String firstEnableTime;
+    private String warrantyDeadline;
+    private String model;
+    private String state;
+    private String stateName;
+    private String communityId;
+    private String brand;
+    private String machineTypeCd;
+    private String machineCode;
+    private String useUserName;
+    private String importanceLevel;
+    private String useOrgId;
+    private String useUseTel;
+    private String machineVersion;
+    private String statusCd = "0";
+    private String chargeUseName;
+    private String usefulLife;
+    private String machineId;
+    private String chargeUseId;
+    private String netWorth;
+    private String chargeOrgTel;
+    private String typeId;
+    private String locationObjId;
+    private String locationObjName;
+    private String useUserId;
+
+    public String getUseOrgName() {
+        return useOrgName;
+    }
+
+    public void setUseOrgName(String useOrgName) {
+        this.useOrgName = useOrgName;
+    }
+
+    public String getLocationTypeCd() {
+        return locationTypeCd;
+    }
+
+    public void setLocationTypeCd(String locationTypeCd) {
+        this.locationTypeCd = locationTypeCd;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getPurchasePrice() {
+        return purchasePrice;
+    }
+
+    public void setPurchasePrice(String purchasePrice) {
+        this.purchasePrice = purchasePrice;
+    }
+
+    public String getChargeOrgName() {
+        return chargeOrgName;
+    }
+
+    public void setChargeOrgName(String chargeOrgName) {
+        this.chargeOrgName = chargeOrgName;
+    }
+
+    public String getMachineName() {
+        return machineName;
+    }
+
+    public void setMachineName(String machineName) {
+        this.machineName = machineName;
+    }
+
+    public String getChargeOrgId() {
+        return chargeOrgId;
+    }
+
+    public void setChargeOrgId(String chargeOrgId) {
+        this.chargeOrgId = chargeOrgId;
+    }
+
+    public String getLocationDetail() {
+        return locationDetail;
+    }
+
+    public void setLocationDetail(String locationDetail) {
+        this.locationDetail = locationDetail;
+    }
+
+    public String getFirstEnableTime() {
+        return firstEnableTime;
+    }
+
+    public void setFirstEnableTime(String firstEnableTime) {
+        this.firstEnableTime = firstEnableTime;
+    }
+
+    public String getWarrantyDeadline() {
+        return warrantyDeadline;
+    }
+
+    public void setWarrantyDeadline(String warrantyDeadline) {
+        this.warrantyDeadline = warrantyDeadline;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getMachineTypeCd() {
+        return machineTypeCd;
+    }
+
+    public void setMachineTypeCd(String machineTypeCd) {
+        this.machineTypeCd = machineTypeCd;
+    }
+
+    public String getMachineCode() {
+        return machineCode;
+    }
+
+    public void setMachineCode(String machineCode) {
+        this.machineCode = machineCode;
+    }
+
+    public String getUseUserName() {
+        return useUserName;
+    }
+
+    public void setUseUserName(String useUserName) {
+        this.useUserName = useUserName;
+    }
+
+    public String getImportanceLevel() {
+        return importanceLevel;
+    }
+
+    public void setImportanceLevel(String importanceLevel) {
+        this.importanceLevel = importanceLevel;
+    }
+
+    public String getUseOrgId() {
+        return useOrgId;
+    }
+
+    public void setUseOrgId(String useOrgId) {
+        this.useOrgId = useOrgId;
+    }
+
+    public String getUseUseTel() {
+        return useUseTel;
+    }
+
+    public void setUseUseTel(String useUseTel) {
+        this.useUseTel = useUseTel;
+    }
+
+    public String getMachineVersion() {
+        return machineVersion;
+    }
+
+    public void setMachineVersion(String machineVersion) {
+        this.machineVersion = machineVersion;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getChargeUseName() {
+        return chargeUseName;
+    }
+
+    public void setChargeUseName(String chargeUseName) {
+        this.chargeUseName = chargeUseName;
+    }
+
+    public String getUsefulLife() {
+        return usefulLife;
+    }
+
+    public void setUsefulLife(String usefulLife) {
+        this.usefulLife = usefulLife;
+    }
+
+    public String getMachineId() {
+        return machineId;
+    }
+
+    public void setMachineId(String machineId) {
+        this.machineId = machineId;
+    }
+
+    public String getChargeUseId() {
+        return chargeUseId;
+    }
+
+    public void setChargeUseId(String chargeUseId) {
+        this.chargeUseId = chargeUseId;
+    }
+
+    public String getNetWorth() {
+        return netWorth;
+    }
+
+    public void setNetWorth(String netWorth) {
+        this.netWorth = netWorth;
+    }
+
+    public String getChargeOrgTel() {
+        return chargeOrgTel;
+    }
+
+    public void setChargeOrgTel(String chargeOrgTel) {
+        this.chargeOrgTel = chargeOrgTel;
+    }
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getLocationObjId() {
+        return locationObjId;
+    }
+
+    public void setLocationObjId(String locationObjId) {
+        this.locationObjId = locationObjId;
+    }
+
+    public String getUseUserId() {
+        return useUserId;
+    }
+
+    public void setUseUserId(String useUserId) {
+        this.useUserId = useUserId;
+    }
+
+    public String getLocationObjName() {
+        return locationObjName;
+    }
+
+    public void setLocationObjName(String locationObjName) {
+        this.locationObjName = locationObjName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+}

java110-bean/src/main/java/com/java110/po/equipmentOperatingLog/EquipmentOperatingLogPo.java

@@ -0,0 +1,103 @@
+/*
+ * 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.po.equipmentOperatingLog;
+
+import java.io.Serializable;
+
+/**
+ * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2022-09-10 10:28:24 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行
+ */
+public class EquipmentOperatingLogPo implements Serializable {
+
+    private String operatingCode;
+private String machineId;
+private String operatingId;
+private String remark;
+private String statusCd = "0";
+private String communityId;
+private String operatingDescriptor;
+private String userName;
+private String userId;
+private String useTel;
+public String getOperatingCode() {
+        return operatingCode;
+    }
+public void setOperatingCode(String operatingCode) {
+        this.operatingCode = operatingCode;
+    }
+public String getMachineId() {
+        return machineId;
+    }
+public void setMachineId(String machineId) {
+        this.machineId = machineId;
+    }
+public String getOperatingId() {
+        return operatingId;
+    }
+public void setOperatingId(String operatingId) {
+        this.operatingId = operatingId;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getOperatingDescriptor() {
+        return operatingDescriptor;
+    }
+public void setOperatingDescriptor(String operatingDescriptor) {
+        this.operatingDescriptor = operatingDescriptor;
+    }
+public String getUserName() {
+        return userName;
+    }
+public void setUserName(String userName) {
+        this.userName = userName;
+    }
+public String getUserId() {
+        return userId;
+    }
+public void setUserId(String userId) {
+        this.userId = userId;
+    }
+public String getUseTel() {
+        return useTel;
+    }
+public void setUseTel(String useTel) {
+        this.useTel = useTel;
+    }
+
+
+
+}

java110-db/src/main/resources/mapper/common/EquipmentAccountV1ServiceDaoImplMapper.xml

@@ -0,0 +1,568 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="equipmentAccountV1ServiceDaoImpl">
+
+
+    <!-- 保存设备台账信息 add by wuxw 2018-07-03 -->
+    <insert id="saveEquipmentAccountInfo" parameterType="Map">
+        insert into equipment_account(use_org_name, location_type_cd, remark, purchase_price, charge_org_name,
+                                      machine_name, charge_org_id, location_detail, first_enable_time,
+                                      warranty_deadline, model, state, community_id, brand, machine_type_cd,
+                                      machine_code, use_user_name, importance_level, use_org_id, use_use_tel,
+                                      machine_version, charge_use_name, useful_life, machine_id, charge_use_id,
+                                      net_worth, charge_org_tel, type_id, location_obj_id, location_obj_name, use_user_id)
+        values (#{useOrgName}, #{locationTypeCd}, #{remark}, #{purchasePrice}, #{chargeOrgName}, #{machineName},
+                #{chargeOrgId}, #{locationDetail}, #{firstEnableTime}, #{warrantyDeadline}, #{model}, #{state},
+                #{communityId}, #{brand}, #{machineTypeCd}, #{machineCode}, #{useUserName}, #{importanceLevel},
+                #{useOrgId}, #{useUseTel}, #{machineVersion}, #{chargeUseName}, #{usefulLife}, #{machineId},
+                #{chargeUseId}, #{netWorth}, #{chargeOrgTel}, #{typeId}, #{locationObjId}, #{locationObjName}, #{useUserId})
+    </insert>
+    <insert id="saveEquipmentAccountInfoSelective" parameterType="Map">
+        insert into equipment_account
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="useOrgName != null" >
+                use_org_name,
+            </if>
+            <if test="locationTypeCd != null" >
+                location_type_cd,
+            </if>
+            <if test="remark != null" >
+                remark,
+            </if>
+            <if test="purchasePrice != null" >
+                purchase_price,
+            </if>
+            <if test="chargeOrgName != null" >
+                charge_org_name,
+            </if>
+            <if test="machineName != null" >
+                machine_name,
+            </if>
+            <if test="chargeOrgId != null" >
+                charge_org_id,
+            </if>
+            <if test="locationDetail != null" >
+                location_detail,
+            </if>
+            <if test="firstEnableTime != null and firstEnableTime!=''" >
+                first_enable_time,
+            </if>
+            <if test="warrantyDeadline != null and warrantyDeadline!=''" >
+                warranty_deadline,
+            </if>
+            <if test="model != null" >
+                model,
+            </if>
+            <if test="state != null" >
+                state,
+            </if>
+            <if test="communityId != null" >
+                community_id,
+            </if>
+            <if test="brand != null" >
+                brand,
+            </if>
+            <if test="machineTypeCd != null" >
+                machine_type_cd,
+            </if>
+            <if test="machineCode != null" >
+                machine_code,
+            </if>
+            <if test="useUserName != null" >
+                use_user_name,
+            </if>
+            <if test="importanceLevel != null" >
+                importance_level,
+            </if>
+            <if test="useOrgId != null" >
+                use_org_id,
+            </if>
+            <if test="useUseTel != null and useUseTel!=''" >
+                use_use_tel,
+            </if>
+            <if test="machineVersion != null and machineVersion!=''" >
+                machine_version,
+            </if>
+            <if test="chargeUseName != null and chargeUseName!=''" >
+                charge_use_name,
+            </if>
+            <if test="usefulLife != null and usefulLife!=''" >
+                useful_life,
+            </if>
+            <if test="machineId != null" >
+                machine_id,
+            </if>
+            <if test="chargeUseId != null" >
+                charge_use_id,
+            </if>
+            <if test="netWorth != null" >
+                net_worth,
+            </if>
+            <if test="chargeOrgTel != null" >
+                charge_org_tel,
+            </if>
+            <if test="typeId != null" >
+                type_id,
+            </if>
+            <if test="locationObjId != null" >
+                location_obj_id,
+            </if>
+            <if test="locationObjName != null" >
+                location_obj_name,
+            </if>
+            <if test="useUserId != null" >
+                use_user_id,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="useOrgName != null" >
+                #{useOrgName},
+            </if>
+            <if test="locationTypeCd != null" >
+                #{locationTypeCd},
+            </if>
+            <if test="remark != null" >
+                #{remark},
+            </if>
+            <if test="purchasePrice != null" >
+                #{purchasePrice},
+            </if>
+            <if test="chargeOrgName != null" >
+                #{chargeOrgName},
+            </if>
+            <if test="machineName != null" >
+                #{machineName},
+            </if>
+            <if test="chargeOrgId != null" >
+                #{chargeOrgId},
+            </if>
+            <if test="locationDetail != null" >
+                #{locationDetail},
+            </if>
+            <if test="firstEnableTime != null and firstEnableTime!=''" >
+                #{firstEnableTime},
+            </if>
+            <if test="warrantyDeadline != null and warrantyDeadline!=''" >
+                #{warrantyDeadline},
+            </if>
+            <if test="model != null" >
+                #{model},
+            </if>
+            <if test="state != null" >
+                #{state},
+            </if>
+            <if test="communityId != null" >
+                #{communityId},
+            </if>
+            <if test="brand != null" >
+                #{brand},
+            </if>
+            <if test="machineTypeCd != null" >
+                #{machineTypeCd},
+            </if>
+            <if test="machineCode != null" >
+                #{machineCode},
+            </if>
+            <if test="useUserName != null" >
+                #{useUserName},
+            </if>
+            <if test="importanceLevel != null" >
+                #{importanceLevel},
+            </if>
+            <if test="useOrgId != null" >
+                #{useOrgId},
+            </if>
+            <if test="useUseTel != null and useUseTel!=''" >
+                #{useUseTel},
+            </if>
+            <if test="machineVersion != null" >
+                #{machineVersion},
+            </if>
+            <if test="chargeUseName != null and chargeUseName!=''" >
+                #{chargeUseName},
+            </if>
+            <if test="usefulLife != null and usefulLife!=''" >
+                #{usefulLife},
+            </if>
+            <if test="machineId != null" >
+                #{machineId},
+            </if>
+            <if test="chargeUseId != null" >
+                #{chargeUseId},
+            </if>
+            <if test="netWorth != null" >
+                #{netWorth},
+            </if>
+            <if test="chargeOrgTel != null" >
+                #{chargeOrgTel},
+            </if>
+            <if test="typeId != null" >
+                #{typeId},
+            </if>
+            <if test="locationObjId != null" >
+                #{locationObjId},
+            </if>
+            <if test="locationObjName != null" >
+                #{locationObjName},
+            </if>
+            <if test="useUserId != null" >
+                #{useUserId},
+            </if>
+        </trim>
+    </insert>
+
+    <!-- 查询设备台账信息 add by wuxw 2018-07-03 -->
+    <select id="getEquipmentAccountInfo" parameterType="Map" resultType="Map">
+        select t.use_org_name,t.use_org_name useOrgName,t.location_type_cd,t.location_type_cd
+        locationTypeCd,t.remark,t.purchase_price,t.purchase_price purchasePrice,t.charge_org_name,t.charge_org_name
+        chargeOrgName,t.machine_name,t.machine_name machineName,t.charge_org_id,t.charge_org_id
+        chargeOrgId,t.location_detail,t.location_detail locationDetail,t.first_enable_time,t.first_enable_time
+        firstEnableTime,t.warranty_deadline,t.warranty_deadline
+        warrantyDeadline,t.model,t.state,t.community_id,t.community_id
+        communityId,t.brand,t.machine_type_cd,t.machine_type_cd machineTypeCd,t.machine_code,t.machine_code
+        machineCode,t.use_user_name,t.use_user_name useUserName,t.importance_level,t.importance_level
+        importanceLevel,t.use_org_id,t.use_org_id useOrgId,t.use_use_tel,t.use_use_tel
+        useUseTel,t.machine_version,t.machine_version machineVersion,t.status_cd,t.status_cd
+        statusCd,t.charge_use_name,t.charge_use_name chargeUseName,t.useful_life,t.useful_life
+        usefulLife,t.machine_id,t.machine_id machineId,t.charge_use_id,t.charge_use_id
+        chargeUseId,t.create_time,t.create_time createTime,t.net_worth,t.net_worth
+        netWorth,t.charge_org_tel,t.charge_org_tel chargeOrgTel,t.type_id,t.type_id
+        typeId,t.location_obj_id,t.location_obj_id locationObjId,t.location_obj_name,t.location_obj_name locationObjName,t.use_user_id,t.use_user_id useUserId,td.name stateName,td1.name levelName
+        from equipment_account t
+        LEFT JOIN t_dict td on td.status_cd = t.state and td.table_name = 'equipment_account' and td.table_columns = 'state'
+        LEFT JOIN t_dict td1 on td1.status_cd = t.importance_level and td1.table_name = 'equipment_account' and td1.table_columns = 'importance_level'
+        where 1 =1
+        <if test="useOrgName !=null and useOrgName != ''">
+            and t.use_org_name= #{useOrgName}
+        </if>
+        <if test="locationTypeCd !=null and locationTypeCd != ''">
+            and t.location_type_cd= #{locationTypeCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="purchasePrice !=null and purchasePrice != ''">
+            and t.purchase_price= #{purchasePrice}
+        </if>
+        <if test="chargeOrgName !=null and chargeOrgName != ''">
+            and t.charge_org_name= #{chargeOrgName}
+        </if>
+        <if test="machineName !=null and machineName != ''">
+            and t.machine_name= #{machineName}
+        </if>
+        <if test="chargeOrgId !=null and chargeOrgId != ''">
+            and t.charge_org_id= #{chargeOrgId}
+        </if>
+        <if test="locationDetail !=null and locationDetail != ''">
+            and t.location_detail= #{locationDetail}
+        </if>
+        <if test="firstEnableTime !=null and firstEnableTime != ''">
+            and t.first_enable_time= #{firstEnableTime}
+        </if>
+        <if test="warrantyDeadline !=null and warrantyDeadline != ''">
+            and t.warranty_deadline= #{warrantyDeadline}
+        </if>
+        <if test="model !=null and model != ''">
+            and t.model= #{model}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="brand !=null and brand != ''">
+            and t.brand= #{brand}
+        </if>
+        <if test="machineTypeCd !=null and machineTypeCd != ''">
+            and t.machine_type_cd= #{machineTypeCd}
+        </if>
+        <if test="machineCode !=null and machineCode != ''">
+            and t.machine_code= #{machineCode}
+        </if>
+        <if test="useUserName !=null and useUserName != ''">
+            and t.use_user_name= #{useUserName}
+        </if>
+        <if test="importanceLevel !=null and importanceLevel != ''">
+            and t.importance_level= #{importanceLevel}
+        </if>
+        <if test="useOrgId !=null and useOrgId != ''">
+            and t.use_org_id= #{useOrgId}
+        </if>
+        <if test="useUseTel !=null and useUseTel != ''">
+            and t.use_use_tel= #{useUseTel}
+        </if>
+        <if test="machineVersion !=null and machineVersion != ''">
+            and t.machine_version= #{machineVersion}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="chargeUseName !=null and chargeUseName != ''">
+            and t.charge_use_name= #{chargeUseName}
+        </if>
+        <if test="usefulLife !=null and usefulLife != ''">
+            and t.useful_life= #{usefulLife}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="machineIds !=null">
+            and t.machine_id in
+            <foreach collection="machineIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="chargeUseId !=null and chargeUseId != ''">
+            and t.charge_use_id= #{chargeUseId}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="netWorth !=null and netWorth != ''">
+            and t.net_worth= #{netWorth}
+        </if>
+        <if test="chargeOrgTel !=null and chargeOrgTel != ''">
+            and t.charge_org_tel= #{chargeOrgTel}
+        </if>
+        <if test="typeId !=null and typeId != ''">
+            and t.type_id= #{typeId}
+        </if>
+        <if test="locationObjId !=null and locationObjId != ''">
+            and t.location_obj_id= #{locationObjId}
+        </if>
+        <if test="locationObjName !=null and locationObjName != ''">
+            and t.location_obj_name= #{locationObjName}
+        </if>
+        <if test="useUserId !=null and useUserId != ''">
+            and t.use_user_id= #{useUserId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改设备台账信息 add by wuxw 2018-07-03 -->
+    <update id="updateEquipmentAccountInfo" parameterType="Map">
+        update equipment_account t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="useOrgName !=null and useOrgName != ''">
+            , t.use_org_name= #{useOrgName}
+        </if>
+        <if test="locationTypeCd !=null and locationTypeCd != ''">
+            , t.location_type_cd= #{locationTypeCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="purchasePrice !=null and purchasePrice != ''">
+            , t.purchase_price= #{purchasePrice}
+        </if>
+        <if test="chargeOrgName !=null and chargeOrgName != ''">
+            , t.charge_org_name= #{chargeOrgName}
+        </if>
+        <if test="machineName !=null and machineName != ''">
+            , t.machine_name= #{machineName}
+        </if>
+        <if test="chargeOrgId !=null and chargeOrgId != ''">
+            , t.charge_org_id= #{chargeOrgId}
+        </if>
+        <if test="locationDetail !=null and locationDetail != ''">
+            , t.location_detail= #{locationDetail}
+        </if>
+        <if test="firstEnableTime !=null and firstEnableTime != ''">
+            , t.first_enable_time= #{firstEnableTime}
+        </if>
+        <if test="warrantyDeadline !=null and warrantyDeadline != ''">
+            , t.warranty_deadline= #{warrantyDeadline}
+        </if>
+        <if test="model !=null and model != ''">
+            , t.model= #{model}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="brand !=null and brand != ''">
+            , t.brand= #{brand}
+        </if>
+        <if test="machineTypeCd !=null and machineTypeCd != ''">
+            , t.machine_type_cd= #{machineTypeCd}
+        </if>
+        <if test="machineCode !=null and machineCode != ''">
+            , t.machine_code= #{machineCode}
+        </if>
+        <if test="useUserName !=null and useUserName != ''">
+            , t.use_user_name= #{useUserName}
+        </if>
+        <if test="importanceLevel !=null and importanceLevel != ''">
+            , t.importance_level= #{importanceLevel}
+        </if>
+        <if test="useOrgId !=null and useOrgId != ''">
+            , t.use_org_id= #{useOrgId}
+        </if>
+        <if test="useUseTel !=null and useUseTel != ''">
+            , t.use_use_tel= #{useUseTel}
+        </if>
+        <if test="machineVersion !=null and machineVersion != ''">
+            , t.machine_version= #{machineVersion}
+        </if>
+        <if test="chargeUseName !=null and chargeUseName != ''">
+            , t.charge_use_name= #{chargeUseName}
+        </if>
+        <if test="usefulLife !=null and usefulLife != ''">
+            , t.useful_life= #{usefulLife}
+        </if>
+        <if test="chargeUseId !=null and chargeUseId != ''">
+            , t.charge_use_id= #{chargeUseId}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            , t.create_time= #{createTime}
+        </if>
+        <if test="netWorth !=null and netWorth != ''">
+            , t.net_worth= #{netWorth}
+        </if>
+        <if test="chargeOrgTel !=null and chargeOrgTel != ''">
+            , t.charge_org_tel= #{chargeOrgTel}
+        </if>
+        <if test="typeId !=null and typeId != ''">
+            , t.type_id= #{typeId}
+        </if>
+        <if test="locationObjId !=null and locationObjId != ''">
+            , t.location_obj_id= #{locationObjId}
+        </if>
+        <if test="locationObjName != null" >
+            , t.location_obj_name= #{locationObjName}
+        </if>
+        <if test="useUserId !=null and useUserId != ''">
+            , t.use_user_id= #{useUserId}
+        </if>
+        where 1=1
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+
+    </update>
+
+    <!-- 查询设备台账数量 add by wuxw 2018-07-03 -->
+    <select id="queryEquipmentAccountsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from equipment_account t
+        where 1 =1
+        <if test="useOrgName !=null and useOrgName != ''">
+            and t.use_org_name= #{useOrgName}
+        </if>
+        <if test="locationTypeCd !=null and locationTypeCd != ''">
+            and t.location_type_cd= #{locationTypeCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="purchasePrice !=null and purchasePrice != ''">
+            and t.purchase_price= #{purchasePrice}
+        </if>
+        <if test="chargeOrgName !=null and chargeOrgName != ''">
+            and t.charge_org_name= #{chargeOrgName}
+        </if>
+        <if test="machineName !=null and machineName != ''">
+            and t.machine_name= #{machineName}
+        </if>
+        <if test="chargeOrgId !=null and chargeOrgId != ''">
+            and t.charge_org_id= #{chargeOrgId}
+        </if>
+        <if test="locationDetail !=null and locationDetail != ''">
+            and t.location_detail= #{locationDetail}
+        </if>
+        <if test="firstEnableTime !=null and firstEnableTime != ''">
+            and t.first_enable_time= #{firstEnableTime}
+        </if>
+        <if test="warrantyDeadline !=null and warrantyDeadline != ''">
+            and t.warranty_deadline= #{warrantyDeadline}
+        </if>
+        <if test="model !=null and model != ''">
+            and t.model= #{model}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="brand !=null and brand != ''">
+            and t.brand= #{brand}
+        </if>
+        <if test="machineTypeCd !=null and machineTypeCd != ''">
+            and t.machine_type_cd= #{machineTypeCd}
+        </if>
+        <if test="machineCode !=null and machineCode != ''">
+            and t.machine_code= #{machineCode}
+        </if>
+        <if test="useUserName !=null and useUserName != ''">
+            and t.use_user_name= #{useUserName}
+        </if>
+        <if test="importanceLevel !=null and importanceLevel != ''">
+            and t.importance_level= #{importanceLevel}
+        </if>
+        <if test="useOrgId !=null and useOrgId != ''">
+            and t.use_org_id= #{useOrgId}
+        </if>
+        <if test="useUseTel !=null and useUseTel != ''">
+            and t.use_use_tel= #{useUseTel}
+        </if>
+        <if test="machineVersion !=null and machineVersion != ''">
+            and t.machine_version= #{machineVersion}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="chargeUseName !=null and chargeUseName != ''">
+            and t.charge_use_name= #{chargeUseName}
+        </if>
+        <if test="usefulLife !=null and usefulLife != ''">
+            and t.useful_life= #{usefulLife}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="machineIds !=null">
+            and t.machine_id in
+            <foreach collection="machineIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="chargeUseId !=null and chargeUseId != ''">
+            and t.charge_use_id= #{chargeUseId}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="netWorth !=null and netWorth != ''">
+            and t.net_worth= #{netWorth}
+        </if>
+        <if test="chargeOrgTel !=null and chargeOrgTel != ''">
+            and t.charge_org_tel= #{chargeOrgTel}
+        </if>
+        <if test="typeId !=null and typeId != ''">
+            and t.type_id= #{typeId}
+        </if>
+        <if test="locationObjId !=null and locationObjId != ''">
+            and t.location_obj_id= #{locationObjId}
+        </if>
+        <if test="locationObjName != null  and locationObjName != ''" >
+            and t.location_obj_name= #{locationObjName}
+        </if>
+        <if test="useUserId !=null and useUserId != ''">
+            and t.use_user_id= #{useUserId}
+        </if>
+    </select>
+
+</mapper>

java110-db/src/main/resources/mapper/common/EquipmentOperatingLogV1ServiceDaoImplMapper.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="equipmentOperatingLogV1ServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存设备操作记录信息 add by wuxw 2018-07-03 -->
+    <insert id="saveEquipmentOperatingLogInfo" parameterType="Map">
+        insert into equipment_operating_log(
+operating_code,machine_id,operating_id,remark,community_id,operating_descriptor,user_name,user_id,use_tel
+) values (
+#{operatingCode},#{machineId},#{operatingId},#{remark},#{communityId},#{operatingDescriptor},#{userName},#{userId},#{useTel}
+)
+    </insert>
+
+
+
+    <!-- 查询设备操作记录信息 add by wuxw 2018-07-03 -->
+    <select id="getEquipmentOperatingLogInfo" parameterType="Map" resultType="Map">
+        select  t.operating_code,t.operating_code operatingCode,t.machine_id,t.machine_id machineId,t.create_time,t.create_time createTime,t.operating_id,t.operating_id operatingId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.operating_descriptor,t.operating_descriptor operatingDescriptor,t.user_name,t.user_name userName,t.user_id,t.user_id userId,t.use_tel,t.use_tel useTel 
+from equipment_operating_log t 
+where 1 =1 
+<if test="operatingCode !=null and operatingCode != ''">
+   and t.operating_code= #{operatingCode}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+<if test="createTime !=null and createTime != ''">
+   and t.create_time= #{createTime}
+</if> 
+<if test="operatingId !=null and operatingId != ''">
+   and t.operating_id= #{operatingId}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="operatingDescriptor !=null and operatingDescriptor != ''">
+   and t.operating_descriptor= #{operatingDescriptor}
+</if> 
+<if test="userName !=null and userName != ''">
+   and t.user_name= #{userName}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="useTel !=null and useTel != ''">
+   and t.use_tel= #{useTel}
+</if> 
+order by t.create_time desc
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改设备操作记录信息 add by wuxw 2018-07-03 -->
+    <update id="updateEquipmentOperatingLogInfo" parameterType="Map">
+        update  equipment_operating_log t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="operatingCode !=null and operatingCode != ''">
+, t.operating_code= #{operatingCode}
+</if> 
+<if test="machineId !=null and machineId != ''">
+, t.machine_id= #{machineId}
+</if> 
+<if test="createTime !=null and createTime != ''">
+, t.create_time= #{createTime}
+</if> 
+<if test="remark !=null and remark != ''">
+, t.remark= #{remark}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="operatingDescriptor !=null and operatingDescriptor != ''">
+, t.operating_descriptor= #{operatingDescriptor}
+</if> 
+<if test="userName !=null and userName != ''">
+, t.user_name= #{userName}
+</if> 
+<if test="userId !=null and userId != ''">
+, t.user_id= #{userId}
+</if> 
+<if test="useTel !=null and useTel != ''">
+, t.use_tel= #{useTel}
+</if> 
+ where 1=1 <if test="operatingId !=null and operatingId != ''">
+and t.operating_id= #{operatingId}
+</if> 
+
+    </update>
+
+    <!-- 查询设备操作记录数量 add by wuxw 2018-07-03 -->
+     <select id="queryEquipmentOperatingLogsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from equipment_operating_log t 
+where 1 =1 
+<if test="operatingCode !=null and operatingCode != ''">
+   and t.operating_code= #{operatingCode}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+<if test="createTime !=null and createTime != ''">
+   and t.create_time= #{createTime}
+</if> 
+<if test="operatingId !=null and operatingId != ''">
+   and t.operating_id= #{operatingId}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="operatingDescriptor !=null and operatingDescriptor != ''">
+   and t.operating_descriptor= #{operatingDescriptor}
+</if> 
+<if test="userName !=null and userName != ''">
+   and t.user_name= #{userName}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="useTel !=null and useTel != ''">
+   and t.use_tel= #{useTel}
+</if> 
+
+
+     </select>
+
+</mapper>

java110-interface/src/main/java/com/java110/intf/common/IEquipmentAccountV1InnerServiceSMO.java

@@ -0,0 +1,68 @@
+/*
+ * 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.intf.common;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.equipmentAccount.EquipmentAccountDto;
+import com.java110.po.equipmentAccount.EquipmentAccountPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-09-10 20:37:25 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行
+ */
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/equipmentAccountV1Api")
+public interface IEquipmentAccountV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveEquipmentAccount", method = RequestMethod.POST)
+    public int saveEquipmentAccount(@RequestBody EquipmentAccountPo equipmentAccountPo);
+
+    @RequestMapping(value = "/updateEquipmentAccount", method = RequestMethod.POST)
+    public int updateEquipmentAccount(@RequestBody EquipmentAccountPo equipmentAccountPo);
+
+    @RequestMapping(value = "/deleteEquipmentAccount", method = RequestMethod.POST)
+    public int deleteEquipmentAccount(@RequestBody EquipmentAccountPo equipmentAccountPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param equipmentAccountDto 数据对象分享
+     * @return EquipmentAccountDto 对象数据
+     */
+    @RequestMapping(value = "/queryEquipmentAccounts", method = RequestMethod.POST)
+    List<EquipmentAccountDto> queryEquipmentAccounts(@RequestBody EquipmentAccountDto equipmentAccountDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param equipmentAccountDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryEquipmentAccountsCount", method = RequestMethod.POST)
+    int queryEquipmentAccountsCount(@RequestBody EquipmentAccountDto equipmentAccountDto);
+}

java110-interface/src/main/java/com/java110/intf/common/IEquipmentOperatingLogV1InnerServiceSMO.java

@@ -0,0 +1,68 @@
+/*
+ * 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.intf.common;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.equipmentOperatingLog.EquipmentOperatingLogDto;
+import com.java110.po.equipmentOperatingLog.EquipmentOperatingLogPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-09-10 10:28:24 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行
+ */
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/equipmentOperatingLogV1Api")
+public interface IEquipmentOperatingLogV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveEquipmentOperatingLog", method = RequestMethod.POST)
+    public int saveEquipmentOperatingLog(@RequestBody EquipmentOperatingLogPo equipmentOperatingLogPo);
+
+    @RequestMapping(value = "/updateEquipmentOperatingLog", method = RequestMethod.POST)
+    public int updateEquipmentOperatingLog(@RequestBody EquipmentOperatingLogPo equipmentOperatingLogPo);
+
+    @RequestMapping(value = "/deleteEquipmentOperatingLog", method = RequestMethod.POST)
+    public int deleteEquipmentOperatingLog(@RequestBody EquipmentOperatingLogPo equipmentOperatingLogPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param equipmentOperatingLogDto 数据对象分享
+     * @return EquipmentOperatingLogDto 对象数据
+     */
+    @RequestMapping(value = "/queryEquipmentOperatingLogs", method = RequestMethod.POST)
+    List<EquipmentOperatingLogDto> queryEquipmentOperatingLogs(@RequestBody EquipmentOperatingLogDto equipmentOperatingLogDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param equipmentOperatingLogDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryEquipmentOperatingLogsCount", method = RequestMethod.POST)
+    int queryEquipmentOperatingLogsCount(@RequestBody EquipmentOperatingLogDto equipmentOperatingLogDto);
+}

service-common/src/main/java/com/java110/common/cmd/equipmentAccount/ChangeStateEquipmentAccountCmd.java

@@ -0,0 +1,89 @@
+/*
+ * 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.equipmentAccount;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.intf.common.IEquipmentOperatingLogV1InnerServiceSMO;
+import com.java110.po.equipmentAccount.EquipmentAccountPo;
+import com.java110.po.equipmentOperatingLog.EquipmentOperatingLogPo;
+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.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * 类表述：更新
+ * 服务编码：equipmentAccount.updateEquipmentAccount
+ * 请求路劲：/app/equipmentAccount.UpdateEquipmentAccount
+ * add by 吴学文 at 2022-09-10 20:37:25 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 = "equipmentAccount.changeStateEquipment")
+public class ChangeStateEquipmentAccountCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(ChangeStateEquipmentAccountCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IEquipmentAccountV1InnerServiceSMO equipmentAccountV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IEquipmentOperatingLogV1InnerServiceSMO equipmentOperatingLogV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "machineId", "machineId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        EquipmentAccountPo equipmentAccountPo = BeanConvertUtil.covertBean(reqJson, EquipmentAccountPo.class);
+        int flag = equipmentAccountV1InnerServiceSMOImpl.updateEquipmentAccount(equipmentAccountPo);
+        if (flag > 0){
+            EquipmentOperatingLogPo equipmentOperatingLogPo = BeanConvertUtil.covertBean(reqJson, EquipmentOperatingLogPo.class);
+            equipmentOperatingLogPo.setOperatingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+            equipmentOperatingLogPo.setMachineId(equipmentAccountPo.getMachineId());
+            equipmentOperatingLogPo.setRemark("改变设备状态");
+            equipmentOperatingLogPo.setCommunityId(equipmentAccountPo.getCommunityId());
+            equipmentOperatingLogPo.setOperatingCode("002");
+            equipmentOperatingLogPo.setOperatingDescriptor("改变设备状态为：" + equipmentAccountPo.getStateName());
+            equipmentOperatingLogV1InnerServiceSMOImpl.saveEquipmentOperatingLog(equipmentOperatingLogPo);
+        }
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-common/src/main/java/com/java110/common/cmd/equipmentAccount/DeleteEquipmentAccountCmd.java

@@ -0,0 +1,70 @@
+/*
+ * 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.equipmentAccount;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.po.equipmentAccount.EquipmentAccountPo;
+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.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 类表述：删除
+ * 服务编码：equipmentAccount.deleteEquipmentAccount
+ * 请求路劲：/app/equipmentAccount.DeleteEquipmentAccount
+ * add by 吴学文 at 2022-09-10 20:37:25 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 = "equipmentAccount.deleteEquipmentAccount")
+public class DeleteEquipmentAccountCmd extends Cmd {
+    private static Logger logger = LoggerFactory.getLogger(DeleteEquipmentAccountCmd.class);
+
+    @Autowired
+    private IEquipmentAccountV1InnerServiceSMO equipmentAccountV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "machineId", "machineId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        EquipmentAccountPo equipmentAccountPo = BeanConvertUtil.covertBean(reqJson, EquipmentAccountPo.class);
+        int flag = equipmentAccountV1InnerServiceSMOImpl.deleteEquipmentAccount(equipmentAccountPo);
+
+        if (flag < 1) {
+            throw new CmdException("删除数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-common/src/main/java/com/java110/common/cmd/equipmentAccount/ListEquipmentAccountCmd.java

@@ -0,0 +1,100 @@
+/*
+ * 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.equipmentAccount;
+
+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.dto.equipmentAccount.EquipmentAccountDto;
+import com.java110.dto.machineType.MachineTypeDto;
+import com.java110.intf.common.IMachineTypeV1InnerServiceSMO;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 类表述：查询
+ * 服务编码：equipmentAccount.listEquipmentAccount
+ * 请求路劲：/app/equipmentAccount.ListEquipmentAccount
+ * add by 吴学文 at 2022-09-10 20:37:25 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 = "equipmentAccount.listEquipmentAccount")
+public class ListEquipmentAccountCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(ListEquipmentAccountCmd.class);
+    @Autowired
+    private IEquipmentAccountV1InnerServiceSMO equipmentAccountV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IMachineTypeV1InnerServiceSMO machineTypeV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        EquipmentAccountDto equipmentAccountDto = BeanConvertUtil.covertBean(reqJson, EquipmentAccountDto.class);
+
+        int count = equipmentAccountV1InnerServiceSMOImpl.queryEquipmentAccountsCount(equipmentAccountDto);
+
+        List<EquipmentAccountDto> equipmentAccountDtos = null;
+
+        if (count > 0) {
+            equipmentAccountDtos = equipmentAccountV1InnerServiceSMOImpl.queryEquipmentAccounts(equipmentAccountDto);
+            MachineTypeDto machineTypeDto = new MachineTypeDto();
+            machineTypeDto.setPage(1);
+            machineTypeDto.setRow(100);
+            machineTypeDto.setCommunityId(equipmentAccountDto.getCommunityId());
+            machineTypeDto.setTypeId(equipmentAccountDto.getTypeId());
+            List<MachineTypeDto> machineTypeDtos = machineTypeV1InnerServiceSMOImpl.queryMachineTypes(machineTypeDto);
+            for (EquipmentAccountDto equ : equipmentAccountDtos) {
+                for (MachineTypeDto typeDto : machineTypeDtos) {
+                    if (typeDto.getTypeId().equals(equ.getTypeId())) {
+                        equ.setMachineTypeName(typeDto.getMachineTypeName());
+                        continue;
+                    }
+                }
+            }
+        } else {
+            equipmentAccountDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, equipmentAccountDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+}

service-common/src/main/java/com/java110/common/cmd/equipmentAccount/MoveEquipmentAccountCmd.java

@@ -0,0 +1,89 @@
+/*
+ * 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.equipmentAccount;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.intf.common.IEquipmentOperatingLogV1InnerServiceSMO;
+import com.java110.po.equipmentAccount.EquipmentAccountPo;
+import com.java110.po.equipmentOperatingLog.EquipmentOperatingLogPo;
+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.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * 类表述：更新
+ * 服务编码：equipmentAccount.updateEquipmentAccount
+ * 请求路劲：/app/equipmentAccount.UpdateEquipmentAccount
+ * add by 吴学文 at 2022-09-10 20:37:25 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 = "equipmentAccount.moveEquipment")
+public class MoveEquipmentAccountCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(MoveEquipmentAccountCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IEquipmentAccountV1InnerServiceSMO equipmentAccountV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IEquipmentOperatingLogV1InnerServiceSMO equipmentOperatingLogV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "machineId", "machineId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        EquipmentAccountPo equipmentAccountPo = BeanConvertUtil.covertBean(reqJson, EquipmentAccountPo.class);
+        int flag = equipmentAccountV1InnerServiceSMOImpl.updateEquipmentAccount(equipmentAccountPo);
+        if (flag > 0){
+            EquipmentOperatingLogPo equipmentOperatingLogPo = BeanConvertUtil.covertBean(reqJson, EquipmentOperatingLogPo.class);
+            equipmentOperatingLogPo.setOperatingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+            equipmentOperatingLogPo.setMachineId(equipmentAccountPo.getMachineId());
+            equipmentOperatingLogPo.setRemark("移动设备");
+            equipmentOperatingLogPo.setCommunityId(equipmentAccountPo.getCommunityId());
+            equipmentOperatingLogPo.setOperatingCode("003");
+            equipmentOperatingLogPo.setOperatingDescriptor("移动资产到：" + equipmentAccountPo.getLocationObjName());
+            equipmentOperatingLogV1InnerServiceSMOImpl.saveEquipmentOperatingLog(equipmentOperatingLogPo);
+        }
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-common/src/main/java/com/java110/common/cmd/equipmentAccount/SaveEquipmentAccountCmd.java

@@ -0,0 +1,115 @@
+/*
+ * 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.equipmentAccount;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.intf.common.IEquipmentOperatingLogV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.equipmentAccount.EquipmentAccountPo;
+import com.java110.po.equipmentOperatingLog.EquipmentOperatingLogPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+
+/**
+ * 类表述：保存
+ * 服务编码：equipmentAccount.saveEquipmentAccount
+ * 请求路劲：/app/equipmentAccount.SaveEquipmentAccount
+ * add by 吴学文 at 2022-09-10 20:37:25 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 = "equipmentAccount.saveEquipmentAccount")
+public class SaveEquipmentAccountCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveEquipmentAccountCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMO;
+
+    @Autowired
+    private IEquipmentAccountV1InnerServiceSMO equipmentAccountV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IEquipmentOperatingLogV1InnerServiceSMO equipmentOperatingLogV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "machineName", "请求报文中未包含machineName");
+        Assert.hasKeyAndValue(reqJson, "machineCode", "请求报文中未包含machineCode");
+        Assert.hasKeyAndValue(reqJson, "typeId", "请求报文中未包含typeId");
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        EquipmentAccountPo equipmentAccountPo = BeanConvertUtil.covertBean(reqJson, EquipmentAccountPo.class);
+        equipmentAccountPo.setMachineId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        //默认设备价格为0.00
+        if(StringUtil.isEmpty(equipmentAccountPo.getPurchasePrice())){
+            equipmentAccountPo.setPurchasePrice(BigDecimal.ZERO.toPlainString());
+        }
+        if(StringUtil.isEmpty(equipmentAccountPo.getNetWorth())){
+            equipmentAccountPo.setNetWorth(BigDecimal.ZERO.toPlainString());
+        }
+        int flag = equipmentAccountV1InnerServiceSMOImpl.saveEquipmentAccount(equipmentAccountPo);
+        if(flag > 0){
+            EquipmentOperatingLogPo equipmentOperatingLogPo = BeanConvertUtil.covertBean(reqJson, EquipmentOperatingLogPo.class);
+            equipmentOperatingLogPo.setOperatingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+            equipmentOperatingLogPo.setMachineId(equipmentAccountPo.getMachineId());
+            equipmentOperatingLogPo.setRemark("设备初始添加入库");
+            equipmentOperatingLogPo.setCommunityId(equipmentAccountPo.getCommunityId());
+            equipmentOperatingLogPo.setOperatingCode("001");
+            equipmentOperatingLogPo.setOperatingDescriptor("设备初始添加入库");
+            String currentUserId = reqJson.getString("userId");
+            System.out.println("currentUserId"+currentUserId);
+//            if (!StringUtil.isEmpty(currentUserId)){
+//                UserPo userDto =  new UserPo();
+//                userDto.setUserId(currentUserId);
+//                UserPo userPo = userV1InnerServiceSMO.queryUserByUserId(userDto);
+//                equipmentOperatingLogPo.setUserName(userPo.getName());
+//                equipmentOperatingLogPo.setUserId(currentUserId);
+//                equipmentOperatingLogPo.setUseTel(userPo.getTel());
+//            }
+            equipmentOperatingLogV1InnerServiceSMOImpl.saveEquipmentOperatingLog(equipmentOperatingLogPo);
+        }
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-common/src/main/java/com/java110/common/cmd/equipmentAccount/UpdateEquipmentAccountCmd.java

@@ -0,0 +1,73 @@
+/*
+ * 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.equipmentAccount;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.po.equipmentAccount.EquipmentAccountPo;
+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.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * 类表述：更新
+ * 服务编码：equipmentAccount.updateEquipmentAccount
+ * 请求路劲：/app/equipmentAccount.UpdateEquipmentAccount
+ * add by 吴学文 at 2022-09-10 20:37:25 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 = "equipmentAccount.updateEquipmentAccount")
+public class UpdateEquipmentAccountCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateEquipmentAccountCmd.class);
+
+
+    @Autowired
+    private IEquipmentAccountV1InnerServiceSMO equipmentAccountV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "machineId", "machineId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        EquipmentAccountPo equipmentAccountPo = BeanConvertUtil.covertBean(reqJson, EquipmentAccountPo.class);
+        int flag = equipmentAccountV1InnerServiceSMOImpl.updateEquipmentAccount(equipmentAccountPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-common/src/main/java/com/java110/common/cmd/equipmentOperatingLog/DeleteEquipmentOperatingLogCmd.java

@@ -0,0 +1,70 @@
+/*
+ * 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.equipmentOperatingLog;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.common.IEquipmentOperatingLogV1InnerServiceSMO;
+import com.java110.po.equipmentOperatingLog.EquipmentOperatingLogPo;
+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.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 类表述：删除
+ * 服务编码：equipmentOperatingLog.deleteEquipmentOperatingLog
+ * 请求路劲：/app/equipmentOperatingLog.DeleteEquipmentOperatingLog
+ * add by 吴学文 at 2022-09-10 10:28:24 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 = "equipmentOperatingLog.deleteEquipmentOperatingLog")
+public class DeleteEquipmentOperatingLogCmd extends Cmd {
+  private static Logger logger = LoggerFactory.getLogger(DeleteEquipmentOperatingLogCmd.class);
+
+    @Autowired
+    private IEquipmentOperatingLogV1InnerServiceSMO equipmentOperatingLogV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "operatingId", "operatingId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+       EquipmentOperatingLogPo equipmentOperatingLogPo = BeanConvertUtil.covertBean(reqJson, EquipmentOperatingLogPo.class);
+        int flag = equipmentOperatingLogV1InnerServiceSMOImpl.deleteEquipmentOperatingLog(equipmentOperatingLogPo);
+
+        if (flag < 1) {
+            throw new CmdException("删除数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-common/src/main/java/com/java110/common/cmd/equipmentOperatingLog/ListEquipmentOperatingLogCmd.java

@@ -0,0 +1,81 @@
+/*
+ * 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.equipmentOperatingLog;
+
+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.dto.equipmentOperatingLog.EquipmentOperatingLogDto;
+import com.java110.intf.common.IEquipmentOperatingLogV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 类表述：查询
+ * 服务编码：equipmentOperatingLog.listEquipmentOperatingLog
+ * 请求路劲：/app/equipmentOperatingLog.ListEquipmentOperatingLog
+ * add by 吴学文 at 2022-09-10 10:28:24 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 = "equipmentOperatingLog.listEquipmentOperatingLog")
+public class ListEquipmentOperatingLogCmd extends Cmd {
+
+  private static Logger logger = LoggerFactory.getLogger(ListEquipmentOperatingLogCmd.class);
+    @Autowired
+    private IEquipmentOperatingLogV1InnerServiceSMO equipmentOperatingLogV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+           EquipmentOperatingLogDto equipmentOperatingLogDto = BeanConvertUtil.covertBean(reqJson, EquipmentOperatingLogDto.class);
+
+           int count = equipmentOperatingLogV1InnerServiceSMOImpl.queryEquipmentOperatingLogsCount(equipmentOperatingLogDto);
+
+           List<EquipmentOperatingLogDto> equipmentOperatingLogDtos = null;
+
+           if (count > 0) {
+               equipmentOperatingLogDtos = equipmentOperatingLogV1InnerServiceSMOImpl.queryEquipmentOperatingLogs(equipmentOperatingLogDto);
+           } else {
+               equipmentOperatingLogDtos = new ArrayList<>();
+           }
+
+           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, equipmentOperatingLogDtos);
+
+           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+           cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+}

service-common/src/main/java/com/java110/common/cmd/equipmentOperatingLog/SaveEquipmentOperatingLogCmd.java

@@ -0,0 +1,77 @@
+/*
+ * 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.equipmentOperatingLog;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.common.IEquipmentOperatingLogV1InnerServiceSMO;
+import com.java110.po.equipmentOperatingLog.EquipmentOperatingLogPo;
+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.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 类表述：保存
+ * 服务编码：equipmentOperatingLog.saveEquipmentOperatingLog
+ * 请求路劲：/app/equipmentOperatingLog.SaveEquipmentOperatingLog
+ * add by 吴学文 at 2022-09-10 10:28:24 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 = "equipmentOperatingLog.saveEquipmentOperatingLog")
+public class SaveEquipmentOperatingLogCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveEquipmentOperatingLogCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IEquipmentOperatingLogV1InnerServiceSMO equipmentOperatingLogV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "machineId", "请求报文中未包含machineId");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "operatingId", "请求报文中未包含operatingId");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        EquipmentOperatingLogPo equipmentOperatingLogPo = BeanConvertUtil.covertBean(reqJson, EquipmentOperatingLogPo.class);
+        equipmentOperatingLogPo.setOperatingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        int flag = equipmentOperatingLogV1InnerServiceSMOImpl.saveEquipmentOperatingLog(equipmentOperatingLogPo);
+
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-common/src/main/java/com/java110/common/cmd/equipmentOperatingLog/UpdateEquipmentOperatingLogCmd.java

@@ -0,0 +1,74 @@
+/*
+ * 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.equipmentOperatingLog;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.intf.common.IEquipmentOperatingLogV1InnerServiceSMO;
+import com.java110.po.equipmentOperatingLog.EquipmentOperatingLogPo;
+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.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * 类表述：更新
+ * 服务编码：equipmentOperatingLog.updateEquipmentOperatingLog
+ * 请求路劲：/app/equipmentOperatingLog.UpdateEquipmentOperatingLog
+ * add by 吴学文 at 2022-09-10 10:28:24 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 = "equipmentOperatingLog.updateEquipmentOperatingLog")
+public class UpdateEquipmentOperatingLogCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateEquipmentOperatingLogCmd.class);
+
+
+    @Autowired
+    private IEquipmentOperatingLogV1InnerServiceSMO equipmentOperatingLogV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "operatingId", "operatingId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        EquipmentOperatingLogPo equipmentOperatingLogPo = BeanConvertUtil.covertBean(reqJson, EquipmentOperatingLogPo.class);
+        int flag = equipmentOperatingLogV1InnerServiceSMOImpl.updateEquipmentOperatingLog(equipmentOperatingLogPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-common/src/main/java/com/java110/common/dao/IEquipmentAccountV1ServiceDao.java

@@ -0,0 +1,77 @@
+/*
+ * 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.dao;
+
+
+import com.java110.utils.exception.DAOException;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-09-10 20:37:24 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行
+ */
+public interface IEquipmentAccountV1ServiceDao {
+
+
+    /**
+     * 保存 设备台账信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveEquipmentAccountInfo(Map info) throws DAOException;
+
+
+    /**
+     * 可选保存设备台账信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveEquipmentAccountInfoSelective(Map info) throws DAOException;
+
+    /**
+     * 查询设备台账信息（instance过程）
+     * 根据bId 查询设备台账信息
+     * @param info bId 信息
+     * @return 设备台账信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getEquipmentAccountInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改设备台账信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateEquipmentAccountInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询设备台账总数
+     *
+     * @param info 设备台账信息
+     * @return 设备台账数量
+     */
+    int queryEquipmentAccountsCount(Map info);
+
+}

service-common/src/main/java/com/java110/common/dao/IEquipmentOperatingLogV1ServiceDao.java

@@ -0,0 +1,72 @@
+/*
+ * 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.dao;
+
+
+import com.java110.utils.exception.DAOException;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-09-10 10:28:22 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行
+ */
+public interface IEquipmentOperatingLogV1ServiceDao {
+
+
+    /**
+     * 保存 设备操作记录信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveEquipmentOperatingLogInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询设备操作记录信息（instance过程）
+     * 根据bId 查询设备操作记录信息
+     * @param info bId 信息
+     * @return 设备操作记录信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getEquipmentOperatingLogInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改设备操作记录信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateEquipmentOperatingLogInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询设备操作记录总数
+     *
+     * @param info 设备操作记录信息
+     * @return 设备操作记录数量
+     */
+    int queryEquipmentOperatingLogsCount(Map info);
+
+}

service-common/src/main/java/com/java110/common/dao/impl/EquipmentAccountV1ServiceDaoImpl.java

@@ -0,0 +1,110 @@
+/*
+ * 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.dao.impl;
+
+import com.java110.common.dao.IEquipmentAccountV1ServiceDao;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.utils.exception.DAOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-09-10 20:37:25 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行
+ */
+@Service("equipmentAccountV1ServiceDaoImpl")
+public class EquipmentAccountV1ServiceDaoImpl extends BaseServiceDao implements IEquipmentAccountV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(EquipmentAccountV1ServiceDaoImpl.class);
+
+    /**
+     * 保存设备台账信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveEquipmentAccountInfo(Map info) throws DAOException {
+        logger.debug("保存 saveEquipmentAccountInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("equipmentAccountV1ServiceDaoImpl.saveEquipmentAccountInfo",info);
+
+        return saveFlag;
+    }
+
+    @Override
+    public int saveEquipmentAccountInfoSelective(Map info) throws DAOException {
+        logger.debug("保存 saveEquipmentAccountSelective 入参 info : {}",info);
+        return sqlSessionTemplate.insert("equipmentAccountV1ServiceDaoImpl.saveEquipmentAccountInfoSelective",info);
+    }
+
+
+    /**
+     * 查询设备台账信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getEquipmentAccountInfo(Map info) throws DAOException {
+        logger.debug("查询 getEquipmentAccountInfo 入参 info : {}",info);
+
+        List<Map> businessEquipmentAccountInfos = sqlSessionTemplate.selectList("equipmentAccountV1ServiceDaoImpl.getEquipmentAccountInfo",info);
+
+        return businessEquipmentAccountInfos;
+    }
+
+
+    /**
+     * 修改设备台账信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateEquipmentAccountInfo(Map info) throws DAOException {
+        logger.debug("修改 updateEquipmentAccountInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("equipmentAccountV1ServiceDaoImpl.updateEquipmentAccountInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询设备台账数量
+     * @param info 设备台账信息
+     * @return 设备台账数量
+     */
+    @Override
+    public int queryEquipmentAccountsCount(Map info) {
+        logger.debug("查询 queryEquipmentAccountsCount 入参 info : {}",info);
+
+        List<Map> businessEquipmentAccountInfos = sqlSessionTemplate.selectList("equipmentAccountV1ServiceDaoImpl.queryEquipmentAccountsCount", info);
+        if (businessEquipmentAccountInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessEquipmentAccountInfos.get(0).get("count").toString());
+    }
+
+
+}

service-common/src/main/java/com/java110/common/dao/impl/EquipmentOperatingLogV1ServiceDaoImpl.java

@@ -0,0 +1,108 @@
+/*
+ * 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.dao.impl;
+
+import com.java110.common.dao.IEquipmentOperatingLogV1ServiceDao;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.utils.exception.DAOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-09-10 10:28:24 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行
+ */
+@Service("equipmentOperatingLogV1ServiceDaoImpl")
+public class EquipmentOperatingLogV1ServiceDaoImpl extends BaseServiceDao implements IEquipmentOperatingLogV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(EquipmentOperatingLogV1ServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存设备操作记录信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveEquipmentOperatingLogInfo(Map info) throws DAOException {
+        logger.debug("保存 saveEquipmentOperatingLogInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("equipmentOperatingLogV1ServiceDaoImpl.saveEquipmentOperatingLogInfo",info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询设备操作记录信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getEquipmentOperatingLogInfo(Map info) throws DAOException {
+        logger.debug("查询 getEquipmentOperatingLogInfo 入参 info : {}",info);
+
+        List<Map> businessEquipmentOperatingLogInfos = sqlSessionTemplate.selectList("equipmentOperatingLogV1ServiceDaoImpl.getEquipmentOperatingLogInfo",info);
+
+        return businessEquipmentOperatingLogInfos;
+    }
+
+
+    /**
+     * 修改设备操作记录信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateEquipmentOperatingLogInfo(Map info) throws DAOException {
+        logger.debug("修改 updateEquipmentOperatingLogInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("equipmentOperatingLogV1ServiceDaoImpl.updateEquipmentOperatingLogInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询设备操作记录数量
+     * @param info 设备操作记录信息
+     * @return 设备操作记录数量
+     */
+    @Override
+    public int queryEquipmentOperatingLogsCount(Map info) {
+        logger.debug("查询 queryEquipmentOperatingLogsCount 入参 info : {}",info);
+
+        List<Map> businessEquipmentOperatingLogInfos = sqlSessionTemplate.selectList("equipmentOperatingLogV1ServiceDaoImpl.queryEquipmentOperatingLogsCount", info);
+        if (businessEquipmentOperatingLogInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessEquipmentOperatingLogInfos.get(0).get("count").toString());
+    }
+
+
+}

service-common/src/main/java/com/java110/common/smo/impl/EquipmentAccountV1InnerServiceSMOImpl.java

@@ -0,0 +1,87 @@
+/*
+ * 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.smo.impl;
+
+
+import com.java110.common.dao.IEquipmentAccountV1ServiceDao;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.equipmentAccount.EquipmentAccountDto;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.po.equipmentAccount.EquipmentAccountPo;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口实现类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-09-10 20:37:25 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行
+ */
+@RestController
+public class EquipmentAccountV1InnerServiceSMOImpl extends BaseServiceSMO implements IEquipmentAccountV1InnerServiceSMO {
+
+    @Autowired
+    private IEquipmentAccountV1ServiceDao equipmentAccountV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveEquipmentAccount(@RequestBody  EquipmentAccountPo equipmentAccountPo) {
+        int saveFlag = equipmentAccountV1ServiceDaoImpl.saveEquipmentAccountInfoSelective(BeanConvertUtil.beanCovertMap(equipmentAccountPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateEquipmentAccount(@RequestBody  EquipmentAccountPo equipmentAccountPo) {
+        int saveFlag = equipmentAccountV1ServiceDaoImpl.updateEquipmentAccountInfo(BeanConvertUtil.beanCovertMap(equipmentAccountPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteEquipmentAccount(@RequestBody  EquipmentAccountPo equipmentAccountPo) {
+       equipmentAccountPo.setStatusCd("1");
+       int saveFlag = equipmentAccountV1ServiceDaoImpl.updateEquipmentAccountInfo(BeanConvertUtil.beanCovertMap(equipmentAccountPo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<EquipmentAccountDto> queryEquipmentAccounts(@RequestBody  EquipmentAccountDto equipmentAccountDto) {
+
+        //校验是否传了 分页信息
+
+        int page = equipmentAccountDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            equipmentAccountDto.setPage((page - 1) * equipmentAccountDto.getRow());
+        }
+
+        List<EquipmentAccountDto> equipmentAccounts = BeanConvertUtil.covertBeanList(equipmentAccountV1ServiceDaoImpl.getEquipmentAccountInfo(BeanConvertUtil.beanCovertMap(equipmentAccountDto)), EquipmentAccountDto.class);
+
+        return equipmentAccounts;
+    }
+
+
+    @Override
+    public int queryEquipmentAccountsCount(@RequestBody EquipmentAccountDto equipmentAccountDto) {
+        return equipmentAccountV1ServiceDaoImpl.queryEquipmentAccountsCount(BeanConvertUtil.beanCovertMap(equipmentAccountDto));    }
+
+}

service-common/src/main/java/com/java110/common/smo/impl/EquipmentOperatingLogV1InnerServiceSMOImpl.java

@@ -0,0 +1,87 @@
+/*
+ * 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.smo.impl;
+
+
+import com.java110.common.dao.IEquipmentOperatingLogV1ServiceDao;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.equipmentOperatingLog.EquipmentOperatingLogDto;
+import com.java110.intf.common.IEquipmentOperatingLogV1InnerServiceSMO;
+import com.java110.po.equipmentOperatingLog.EquipmentOperatingLogPo;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口实现类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-09-10 10:28:24 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行
+ */
+@RestController
+public class EquipmentOperatingLogV1InnerServiceSMOImpl extends BaseServiceSMO implements IEquipmentOperatingLogV1InnerServiceSMO {
+
+    @Autowired
+    private IEquipmentOperatingLogV1ServiceDao equipmentOperatingLogV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveEquipmentOperatingLog(@RequestBody  EquipmentOperatingLogPo equipmentOperatingLogPo) {
+        int saveFlag = equipmentOperatingLogV1ServiceDaoImpl.saveEquipmentOperatingLogInfo(BeanConvertUtil.beanCovertMap(equipmentOperatingLogPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateEquipmentOperatingLog(@RequestBody  EquipmentOperatingLogPo equipmentOperatingLogPo) {
+        int saveFlag = equipmentOperatingLogV1ServiceDaoImpl.updateEquipmentOperatingLogInfo(BeanConvertUtil.beanCovertMap(equipmentOperatingLogPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteEquipmentOperatingLog(@RequestBody  EquipmentOperatingLogPo equipmentOperatingLogPo) {
+       equipmentOperatingLogPo.setStatusCd("1");
+       int saveFlag = equipmentOperatingLogV1ServiceDaoImpl.updateEquipmentOperatingLogInfo(BeanConvertUtil.beanCovertMap(equipmentOperatingLogPo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<EquipmentOperatingLogDto> queryEquipmentOperatingLogs(@RequestBody  EquipmentOperatingLogDto equipmentOperatingLogDto) {
+
+        //校验是否传了 分页信息
+
+        int page = equipmentOperatingLogDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            equipmentOperatingLogDto.setPage((page - 1) * equipmentOperatingLogDto.getRow());
+        }
+
+        List<EquipmentOperatingLogDto> equipmentOperatingLogs = BeanConvertUtil.covertBeanList(equipmentOperatingLogV1ServiceDaoImpl.getEquipmentOperatingLogInfo(BeanConvertUtil.beanCovertMap(equipmentOperatingLogDto)), EquipmentOperatingLogDto.class);
+
+        return equipmentOperatingLogs;
+    }
+
+
+    @Override
+    public int queryEquipmentOperatingLogsCount(@RequestBody EquipmentOperatingLogDto equipmentOperatingLogDto) {
+        return equipmentOperatingLogV1ServiceDaoImpl.queryEquipmentOperatingLogsCount(BeanConvertUtil.beanCovertMap(equipmentOperatingLogDto));    }
+
+}