小区和设备

zoniot-common/zoniot-core-mysql/src/main/java/com/zcxk/core/mysql/model/BaseDO.java

@@ -1,5 +1,6 @@
 package com.zcxk.core.mysql.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -15,12 +16,12 @@ public class BaseDO {
     /**
      * 创建时间
      **/
-    private LocalDateTime createTime;
+    private LocalDateTime createDate;
 
     /**
      * 创建人名称
      **/
-    private String creatorName;
+    private String creatorBy;
 
     /**
      * 创建人Id
@@ -40,13 +41,17 @@ public class BaseDO {
     /**
      * 修改时间
      **/
-    private LocalDateTime updateTime;
+    private LocalDateTime updateDate;
 
     /**
-     * 是否删除
-     *
-     * @author Richard
+     * 修改人名称
      **/
-    private Boolean enable = true;
+    private LocalDateTime updateBy;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value="状态")
+    private Integer status;
 
 }

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

@@ -12,7 +12,7 @@ import lombok.Data;
  * @author linqingwei
  * @date 2021-07-19 9:45
  */
-@ApiModel(value="com-zcxk-rmcp-web-entity-Community")
+@ApiModel(value="com-zcxk-rmcp-core-entity-Community")
 @Data
 public class Community extends BaseDO {
     /**
@@ -90,33 +90,4 @@ public class Community extends BaseDO {
     @ApiModelProperty(value="备注")
     private String remark;
 
-    /**
-    * 状态
-    */
-    @ApiModelProperty(value="状态")
-    private Integer status;
-
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty(value="创建时间")
-    private LocalDateTime dateCreate;
-
-    /**
-    * 更新时间
-    */
-    @ApiModelProperty(value="更新时间")
-    private LocalDateTime dateUpdate;
-
-    /**
-    * 创建人
-    */
-    @ApiModelProperty(value="创建人")
-    private String createBy;
-
-    /**
-    * 更新人
-    */
-    @ApiModelProperty(value="更新人")
-    private String updateBy;
 }

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

@@ -1,5 +1,6 @@
 package com.zcxk.rmcp.core.entity;
 
+import com.zcxk.core.mysql.model.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
@@ -11,7 +12,7 @@ import lombok.Data;
  * @author linqingwei
  * @date 2021-07-19 9:44
  */
-@ApiModel(value="com-zcxk-rmcp-web-entity-Device")
+@ApiModel(value="com-zcxk-rmcp-core-entity-Device")
 @Data
 public class Device {
     @ApiModelProperty(value="")

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

@@ -18,15 +18,15 @@
     <result column="lat" property="lat" />
     <result column="remark" property="remark" />
     <result column="status" property="status" />
-    <result column="date_create" property="dateCreate" />
-    <result column="date_update" property="dateUpdate" />
+    <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, company_org_id, dept_org_id, `name`, code, province, city, region, 
-    address, lng, lat, remark, `status`, date_create, date_update, create_by, update_by
+    address, lng, lat, remark, `status`, create_date, update_date, create_by, update_by
   </sql>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.rmcp.core.entity.Community" useGeneratedKeys="true">
     <!--@mbg.generated-->
@@ -72,10 +72,10 @@
         `status`,
       </if>
       <if test="dateCreate != null">
-        date_create,
+        create_date,
       </if>
       <if test="dateUpdate != null">
-        date_update,
+        update_date,
       </if>
       <if test="createBy != null">
         create_by,
@@ -125,10 +125,10 @@
         #{status},
       </if>
       <if test="dateCreate != null">
-        #{dateCreate},
+        #{createDate},
       </if>
       <if test="dateUpdate != null">
-        #{dateUpdate},
+        #{updateDate},
       </if>
       <if test="createBy != null">
         #{createBy},
@@ -182,10 +182,10 @@
         `status` = #{status},
       </if>
       <if test="dateCreate != null">
-        date_create = #{dateCreate},
+        create_date = #{createDate},
       </if>
       <if test="dateUpdate != null">
-        date_update = #{dateUpdate},
+        update_date = #{updateDate},
       </if>
       <if test="createBy != null">
         create_by = #{createBy},

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/TestController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/test")
 public class TestController {
 
+
+
     @PostMapping("/test")
     public AjaxMessage<Void> test(){
         System.out.println("test");