fix-1002347: 小号新增编号

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/impl/PcloudRobotBizImpl.java

@@ -84,6 +84,16 @@ public class PcloudRobotBizImpl implements PcloudRobotBiz {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updatePcloudRobot(PcloudRobot pcloudRobot) {
+        if (!StringUtil.isEmpty(pcloudRobot.getUniqueNumber())){
+            if (pcloudRobot.getUniqueNumber().length() > 20){
+                throw new BookBizException(BookBizException.PARAM_IS_ERROR, "编号长度不能超过20，请重新输入");
+            }
+            //校验编号是否重复
+            PcloudRobot robot = pcloudRobotDao.getByUniqueNumber(pcloudRobot.getUniqueNumber());
+            if (null != robot){
+                throw new BookBizException(BookBizException.PARAM_IS_ERROR, "编号重复，请重新输入");
+            }
+        }
         pcloudRobotDao.update(pcloudRobot);
         if(pcloudRobot.getRobotType() != null) {
             PcloudRobotQrcode robotQrcode = pcloudRobotQrcodeDao.getByRobotType(pcloudRobot.getRobotType());

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/dao/PcloudRobotDao.java

@@ -21,4 +21,11 @@ public interface PcloudRobotDao extends BaseDao<PcloudRobot> {
 
     List<RobotClassifyDTO> getAllPcloudRobot();
 
+    /**
+     * 根据编号获取小号
+     * @param uniqueNumber
+     * @return
+     */
+    PcloudRobot getByUniqueNumber(String uniqueNumber);
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/dao/impl/PcloudRobotDaoImpl.java

@@ -42,4 +42,9 @@ public class PcloudRobotDaoImpl extends BaseDaoImpl<PcloudRobot> implements Pclo
         return this.getSessionTemplate().selectList(this.getStatement("getAllPcloudRobot"));
     }
 
+    @Override
+    public PcloudRobot getByUniqueNumber(String uniqueNumber) {
+        return this.getSessionTemplate().selectOne(this.getStatement("getByUniqueNumber"), uniqueNumber);
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/entity/PcloudRobot.java

@@ -52,4 +52,7 @@ public class PcloudRobot extends BaseEntity {
 
     @ApiModelProperty("自动唤醒配置 1开启")
     private Integer wakeUp;
+
+    @ApiModelProperty("编号")
+    private String uniqueNumber;
 }

pcloud-service-book/src/main/resources/mapper/pcloudkeyword/PcloudRobot.Mapper.xml

@@ -11,10 +11,10 @@
       <result column="keyword_classify_id" jdbcType="BIGINT" property="keywordClassifyId" />
     <result column="state" property="state" jdbcType="INTEGER" />
       <result column="wake_up" property="wakeUp" jdbcType="INTEGER" />
-
+    <result column="unique_number" property="uniqueNumber" jdbcType="VARCHAR"/>
   </resultMap>
   <sql id="Base_Column_List" >
-    id, wx_id, nick_name, head, qrcode_url, robot_type, keyword_classify_id, state, wake_up
+    id, wx_id, nick_name, head, qrcode_url, robot_type, keyword_classify_id, state, wake_up, unique_number
   </sql>
 
   <insert id="insert" parameterType="PcloudRobot" useGeneratedKeys="true" keyProperty="id">
@@ -26,7 +26,8 @@
         robot_type,
         keyword_classify_id,
         state,
-        wake_up
+        wake_up,
+        unique_number
       )
     values (
       #{wxId,jdbcType=VARCHAR},
@@ -36,7 +37,8 @@
       #{robotType,jdbcType=INTEGER},
       #{keywordClassifyId,jdbcType=BIGINT},
       #{state,jdbcType=INTEGER},
-      #{wakeUp,jdbcType=INTEGER}
+      #{wakeUp,jdbcType=INTEGER},
+      #{uniqueNumber, jdbcType=VARCHAR}
       )
   </insert>
 
@@ -67,6 +69,9 @@
             <if test="wakeUp != null">
                 wake_up = #{wakeUp,jdbcType=INTEGER},
             </if>
+            <if test="uniqueNumber != null">
+                unique_number = #{uniqueNumber, jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -92,6 +97,7 @@
         r.robot_type robotType,
         r.keyword_classify_id keywordClassifyId,
         r.state state,
+        r.unique_number uniqueNumber,
         rc.classify_name classifyName
         FROM
             pcloud_robot r
@@ -184,4 +190,10 @@
         pr.is_delete = 0
     </select>
 
+    <select id="getByUniqueNumber" parameterType="string" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from pcloud_robot where unique_number = #{uniqueNumber}
+        limit 1
+    </select>
+
 </mapper>
\ No newline at end of file