Merge branch 'feat-saveClassify' into 'master'

修改编号

See merge request rays/pcloud-book!451

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

@@ -99,4 +99,6 @@ public interface PcloudRobotBiz {
     public String generateLinkbyAppProduct(String link, Long serveId, String serveType, String userWxId, String robotId);
 
     List<String> getPcloudRobotByTypes(List<Integer> classifyIds);
+
+    void updateUniqueNumber(Long id, String uniqueNumber);
 }

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

@@ -636,6 +636,19 @@ public class PcloudRobotBizImpl implements PcloudRobotBiz {
         pcloudRobotDao.updateRobotType(paramMap);
     }
 
+    @Override
+    public void updateUniqueNumber(Long id, String uniqueNumber) {
+        //校验编号是否重复
+        PcloudRobot robot = pcloudRobotDao.getByUniqueNumber(uniqueNumber);
+        if (null != robot && !robot.getId().equals(id)){
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "编号重复，请重新输入");
+        }
+        PcloudRobot pcloudRobot = new PcloudRobot();
+        pcloudRobot.setId(id);
+        pcloudRobot.setUniqueNumber(uniqueNumber);
+        pcloudRobotDao.update(pcloudRobot);
+    }
+
     private void sendTdReplyMessage(String ip, String robotWxId, String userWxId, List<PcloudTdReplyDTO> replyDTOS) {
         for (PcloudTdReplyDTO tdReplyDTO : replyDTOS) {
             Integer replyType = tdReplyDTO.getReplyType();

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

@@ -44,6 +44,7 @@ public class PcloudRobotClassifyBizImpl implements PcloudRobotClassifyBiz {
     }
 
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public void saveRobotClassify(String classifyName) {
         PcloudRobotClassify classify = new PcloudRobotClassify();
         classify.setClassifyName(classifyName);

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/facade/PcloudRobotFacade.java

@@ -280,4 +280,16 @@ public class PcloudRobotFacade {
             @RequestParam("robotId") @ApiParam("个人号id")String robotId){
         return new ResponseDto<>(pcloudRobotBiz.generateLinkbyAppProduct(link, serveId, serveType, userWxId, robotId));
     }
+
+    @ApiOperation("修改机器人编码")
+    @GetMapping("/updateUniqueNumber")
+    ResponseDto<?> updateUniqueNumber(
+            @RequestHeader("token") @ApiParam("token信息") String token,
+            @RequestParam(value = "id") @ApiParam("ID") Long id,
+            @RequestParam(value = "uniqueNumber") @ApiParam("编码") String uniqueNumber
+    ) throws BizException, PermissionException {
+        SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        pcloudRobotBiz.updateUniqueNumber(id, uniqueNumber);
+        return new ResponseDto<>();
+    }
 }

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

@@ -37,7 +37,7 @@
   </insert>
 
     <update id="update" parameterType="com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify">
-        update pcloud_robot
+        update pcloud_robot_classify
         <set>
             <if test="classifyName != null">
                 classify_name = #{classifyName},