设备信息

zoniot-common/zoniot-core-common/src/main/java/com/zcxk/core/common/util/UserUtil.java

@@ -67,5 +67,11 @@ public class UserUtil {
         return new LoginUser(null);
     }
 
+    public static String getUsername() {
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        if (loginUser != null)  return loginUser.getUsername();
+        return "system";
+    }
+
 
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/MeterReplaceLogMapper.java

@@ -0,0 +1,16 @@
+package com.zcxk.rmcp.core.dao;
+
+import com.zcxk.rmcp.core.entity.MeterReplaceLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * @author linqingwei
+ * @date 2021-07-20 17:17
+ */
+@Mapper
+public interface MeterReplaceLogMapper {
+    int insertSelective(MeterReplaceLog record);
+
+    int updateByPrimaryKeySelective(MeterReplaceLog record);
+}

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/entity/MeterReplaceLog.java

@@ -0,0 +1,144 @@
+package com.zcxk.rmcp.core.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+ * 
+ * @author linqingwei
+ * @date 2021-07-20 17:17
+ */
+/**
+    * 水表换表记录表
+    */
+@ApiModel(value="com-zcxk-rmcp-core-entity-MeterReplaceLog")
+@Data
+public class MeterReplaceLog {
+    /**
+    * 主键
+    */
+    @ApiModelProperty(value="主键")
+    private Integer id;
+
+    /**
+    * 租户
+    */
+    @ApiModelProperty(value="租户")
+    private String tenantId;
+
+    /**
+    * 参考sc_device表id
+    */
+    @ApiModelProperty(value="设备id")
+    private Long deviceId;
+
+    /**
+    * 更换方案，1 更换模块，2:更换整表
+    */
+    @ApiModelProperty(value="更换方案，1 更换模块，2:更换整表")
+    private Integer replaceMethod;
+
+    /**
+    * 新产品类型
+    */
+    @ApiModelProperty(value="新产品类型")
+    private Integer newProductId;
+
+    /**
+    * 旧产品类型
+    */
+    @ApiModelProperty(value="旧产品类型")
+    private Integer oldProductId;
+
+    /**
+    * 新表电子号
+    */
+    @ApiModelProperty(value="新表电子号")
+    private String newMeterNo;
+
+    /**
+    * 旧表电子号
+    */
+    @ApiModelProperty(value="旧表电子号")
+    private String oldMeterNo;
+
+    /**
+    * 新表起度
+    */
+    @ApiModelProperty(value="新表起度")
+    private String newBeginDegree;
+
+    /**
+    * 旧表止度
+    */
+    @ApiModelProperty(value="旧表止度")
+    private String oldEndDegree;
+
+    /**
+    * 新节点编号
+    */
+    @ApiModelProperty(value="新节点编号")
+    private String newDeviceNo;
+
+    /**
+    * 旧节点编号
+    */
+    @ApiModelProperty(value="旧节点编号")
+    private String oldDeviceNo;
+
+    /**
+    * 备注
+    */
+    @ApiModelProperty(value="备注")
+    private String remark;
+
+    /**
+    * 状态
+    */
+    @ApiModelProperty(value="状态")
+    private Integer status;
+
+    /**
+    * 更换人
+    */
+    @ApiModelProperty(value="更换人")
+    private String replaceUsername;
+
+    /**
+    * 更换人手机号码
+    */
+    @ApiModelProperty(value="更换人手机号码")
+    private String replaceUserPhone;
+
+    /**
+    * 同步状态
+    */
+    @ApiModelProperty(value="同步状态")
+    private Integer syncStatus;
+
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty(value="创建时间")
+    private LocalDateTime createDate;
+
+    /**
+    * 更新时间
+    */
+    @ApiModelProperty(value="更新时间")
+    private LocalDateTime updateDate;
+
+    /**
+    * 创建人
+    */
+    @ApiModelProperty(value="创建人")
+    private String createBy;
+
+    /**
+    * 更新人
+    */
+    @ApiModelProperty(value="更新人")
+    private String updateBy;
+}

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/MeterReplaceLogMapper.xml

@@ -0,0 +1,231 @@
+<?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="com.zcxk.rmcp.core.dao.MeterReplaceLogMapper">
+  <resultMap id="BaseResultMap" type="com.zcxk.rmcp.core.entity.MeterReplaceLog">
+    <!--@mbg.generated-->
+    <!--@Table rmcp_meter_replace_log-->
+    <id column="id" property="id" />
+    <result column="tenant_id" property="tenantId" />
+    <result column="device_id" property="deviceId" />
+    <result column="replace_method" property="replaceMethod" />
+    <result column="new_product_id" property="newProductId" />
+    <result column="old_product_id" property="oldProductId" />
+    <result column="new_meter_no" property="newMeterNo" />
+    <result column="old_meter_no" property="oldMeterNo" />
+    <result column="new_begin_degree" property="newBeginDegree" />
+    <result column="old_end_degree" property="oldEndDegree" />
+    <result column="new_device_no" property="newDeviceNo" />
+    <result column="old_device_no" property="oldDeviceNo" />
+    <result column="remark" property="remark" />
+    <result column="status" property="status" />
+    <result column="replace_username" property="replaceUsername" />
+    <result column="replace_user_phone" property="replaceUserPhone" />
+    <result column="sync_status" property="syncStatus" />
+    <result column="create_date" property="createDate" />
+    <result column="update_date" property="updateDate" />
+    <result column="create_by" property="createBy" />
+    <result column="update_by" property="updateBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, tenant_id, device_id, replace_method, new_product_id, old_product_id, new_meter_no, 
+    old_meter_no, new_begin_degree, old_end_degree, new_device_no, old_device_no, remark, 
+    `status`, replace_username, replace_user_phone, sync_status, create_date, update_date,
+    create_by, update_by
+  </sql>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.rmcp.core.entity.MeterReplaceLog" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into rmcp_meter_replace_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
+      <if test="deviceId != null">
+        device_id,
+      </if>
+      <if test="replaceMethod != null">
+        replace_method,
+      </if>
+      <if test="newProductId != null">
+        new_product_id,
+      </if>
+      <if test="oldProductId != null">
+        old_product_id,
+      </if>
+      <if test="newMeterNo != null">
+        new_meter_no,
+      </if>
+      <if test="oldMeterNo != null">
+        old_meter_no,
+      </if>
+      <if test="newBeginDegree != null">
+        new_begin_degree,
+      </if>
+      <if test="oldEndDegree != null">
+        old_end_degree,
+      </if>
+      <if test="newDeviceNo != null">
+        new_device_no,
+      </if>
+      <if test="oldDeviceNo != null">
+        old_device_no,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="replaceUsername != null">
+        replace_username,
+      </if>
+      <if test="replaceUserPhone != null">
+        replace_user_phone,
+      </if>
+      <if test="syncStatus != null">
+        sync_status,
+      </if>
+      <if test="createDate != null">
+        create_date,
+      </if>
+      <if test="updateDate != null">
+        update_date,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="tenantId != null">
+        #{tenantId},
+      </if>
+      <if test="deviceId != null">
+        #{deviceId},
+      </if>
+      <if test="replaceMethod != null">
+        #{replaceMethod},
+      </if>
+      <if test="newProductId != null">
+        #{newProductId},
+      </if>
+      <if test="oldProductId != null">
+        #{oldProductId},
+      </if>
+      <if test="newMeterNo != null">
+        #{newMeterNo},
+      </if>
+      <if test="oldMeterNo != null">
+        #{oldMeterNo},
+      </if>
+      <if test="newBeginDegree != null">
+        #{newBeginDegree},
+      </if>
+      <if test="oldEndDegree != null">
+        #{oldEndDegree},
+      </if>
+      <if test="newDeviceNo != null">
+        #{newDeviceNo},
+      </if>
+      <if test="oldDeviceNo != null">
+        #{oldDeviceNo},
+      </if>
+      <if test="remark != null">
+        #{remark},
+      </if>
+      <if test="status != null">
+        #{status},
+      </if>
+      <if test="replaceUsername != null">
+        #{replaceUsername},
+      </if>
+      <if test="replaceUserPhone != null">
+        #{replaceUserPhone},
+      </if>
+      <if test="syncStatus != null">
+        #{syncStatus},
+      </if>
+      <if test="createDate != null">
+        #{createDate},
+      </if>
+      <if test="updateDate != null">
+        #{updateDate},
+      </if>
+      <if test="createBy != null">
+        #{createBy},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.zcxk.rmcp.core.entity.MeterReplaceLog">
+    <!--@mbg.generated-->
+    update rmcp_meter_replace_log
+    <set>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId},
+      </if>
+      <if test="deviceId != null">
+        device_id = #{deviceId},
+      </if>
+      <if test="replaceMethod != null">
+        replace_method = #{replaceMethod},
+      </if>
+      <if test="newProductId != null">
+        new_product_id = #{newProductId},
+      </if>
+      <if test="oldProductId != null">
+        old_product_id = #{oldProductId},
+      </if>
+      <if test="newMeterNo != null">
+        new_meter_no = #{newMeterNo},
+      </if>
+      <if test="oldMeterNo != null">
+        old_meter_no = #{oldMeterNo},
+      </if>
+      <if test="newBeginDegree != null">
+        new_begin_degree = #{newBeginDegree},
+      </if>
+      <if test="oldEndDegree != null">
+        old_end_degree = #{oldEndDegree},
+      </if>
+      <if test="newDeviceNo != null">
+        new_device_no = #{newDeviceNo},
+      </if>
+      <if test="oldDeviceNo != null">
+        old_device_no = #{oldDeviceNo},
+      </if>
+      <if test="remark != null">
+        remark = #{remark},
+      </if>
+      <if test="status != null">
+        `status` = #{status},
+      </if>
+      <if test="replaceUsername != null">
+        replace_username = #{replaceUsername},
+      </if>
+      <if test="replaceUserPhone != null">
+        replace_user_phone = #{replaceUserPhone},
+      </if>
+      <if test="syncStatus != null">
+        sync_status = #{syncStatus},
+      </if>
+      <if test="createDate != null">
+        create_date = #{createDate},
+      </if>
+      <if test="updateDate != null">
+        update_date = #{updateDate},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy},
+      </if>
+    </set>
+    where id = #{id}
+  </update>
+</mapper>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/MeterReplaceLogService.java

@@ -0,0 +1,16 @@
+package com.zcxk.rmcp.web.service;
+
+import com.zcxk.rmcp.core.entity.MeterReplaceLog;
+    /**
+ * 
+ * @author linqingwei
+ * @date 2021-07-20 17:17
+ */
+public interface MeterReplaceLogService{
+
+
+    int insertSelective(MeterReplaceLog record);
+
+    int updateByPrimaryKeySelective(MeterReplaceLog record);
+
+}

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/DeviceServiceImpl.java

@@ -43,11 +43,17 @@ public class DeviceServiceImpl implements DeviceService{
 
     @Override
     public int insertSelective(Device record) {
+        record.setCreateBy(UserUtil.getUsername());
+        record.setCreateDate(LocalDateTime.now());
+        record.setUpdateBy(UserUtil.getUsername());
+        record.setUpdateDate(LocalDateTime.now());
         return deviceMapper.insertSelective(record);
     }
 
     @Override
     public int updateByPrimaryKeySelective(Device record) {
+        record.setUpdateBy(UserUtil.getUsername());
+        record.setUpdateDate(LocalDateTime.now());
         return deviceMapper.updateByPrimaryKeySelective(record);
     }
 
@@ -82,35 +88,10 @@ public class DeviceServiceImpl implements DeviceService{
         BeanCopyUtils.copyProperties(dto, device, Device.class);
         device.setId(idWorker.nextId());
         device.setTenantId(user.getTenantId());
-
         device.setDeviceStatus(DeviceStatusEnum.UNUSED.getCode());
-
         device.setValveStatus(ValveStatusEnum.ON.getCode());
         device.setStatus(StatusEnum.OK.getCode());
-        device.setCreateBy(user.getUsername());
-        device.setCreateDate(LocalDateTime.now());
-        device.setUpdateBy(user.getUsername());
-        device.setUpdateDate(LocalDateTime.now());
-        deviceMapper.insertSelective(device);
-
-        //光电
-        /*if (deviceDataDto.getConcentratorId() != null) {
-            WaterRelatedDevice waterRelatedDevice = new WaterRelatedDevice();
-            waterRelatedDevice.setDeviceId(device.getId());
-            waterRelatedDevice.setConcentratorId(deviceDataDto.getConcentratorId());
-            waterRelatedDevice.setCollectorId(deviceDataDto.getCollectorId());
-            waterRelatedDevice.setChannelNumberId(deviceDataDto.getChannelNumberId());
-            waterRelatedDevice.setPort(deviceDataDto.getPort());
-            //waterRelatedDevice.setRemark();
-            waterRelatedDevice.setIssueStatus(0);
-            waterRelatedDevice.setStatus(1);
-            waterRelatedDevice.setDateCreate(LocalDateTime.now());
-            waterRelatedDevice.setDateUpdate(LocalDateTime.now());
-            waterRelatedDevice.setCreateBy(UserUtil.getCurrentUser().getUsername());
-            waterRelatedDevice.setUpdateBy(UserUtil.getCurrentUser().getUsername());
-            waterRelatedDeviceMapper.insertSelective(waterRelatedDevice);
-
-        }*/
+        this.insertSelective(device);
 
         log.info("end DeviceServiceImpl add ");
     }
@@ -118,7 +99,6 @@ public class DeviceServiceImpl implements DeviceService{
     @Override
     public void edit(DeviceInputDto dto) {
         log.info("begin DeviceServiceImpl edit device = {}", JSON.toJSON(dto));
-        LoginUser user = UserUtil.getCurrentUser();
 
         if (deviceMapper.findByDeviceNoUnique(dto.getId(), dto.getDeviceNo()) > 0) {
             throw BusinessException.builder(RmcpErrorEnum.RMCP_DEVICE_NO_UNIQUE_ERROR);
@@ -129,9 +109,6 @@ public class DeviceServiceImpl implements DeviceService{
         //更新数据
         Device device = new Device();
         BeanCopyUtils.copyProperties(dto, device, Device.class);
-
-        device.setUpdateBy(user.getUsername());
-        device.setUpdateDate(LocalDateTime.now());
         this.updateByPrimaryKeySelective(device);
         log.info("end DeviceServiceImpl edit ");
     }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/MeterReplaceLogServiceImpl.java

@@ -0,0 +1,30 @@
+package com.zcxk.rmcp.web.service.impl;
+
+import com.zcxk.rmcp.web.service.MeterReplaceLogService;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import com.zcxk.rmcp.core.entity.MeterReplaceLog;
+import com.zcxk.rmcp.core.dao.MeterReplaceLogMapper;
+
+/**
+ * 
+ * @author linqingwei
+ * @date 2021-07-20 17:17
+ */
+@Service
+public class MeterReplaceLogServiceImpl implements MeterReplaceLogService {
+
+    @Resource
+    private MeterReplaceLogMapper meterReplaceLogMapper;
+
+    @Override
+    public int insertSelective(MeterReplaceLog record) {
+        return meterReplaceLogMapper.insertSelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(MeterReplaceLog record) {
+        return meterReplaceLogMapper.updateByPrimaryKeySelective(record);
+    }
+
+}