Merge branch 'hzk' into 'master'

微信群打卡应用新增删除

See merge request rays/pcloud-book!19

pcloud-service-book/src/main/java/com/pcloud/book/clock/biz/BookClockBiz.java

@@ -60,4 +60,11 @@ public interface BookClockBiz {
      */
     void sendBookClockGroupMessage(Map<String, Object> paramMap);
 
+    /**
+     * 删除关联关系
+     * @param bookClockInfoId
+     * @param adviserId
+     */
+    void deleteBookGroupClock(Long bookClockInfoId,Long adviserId);
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/clock/biz/impl/BookClockBizImpl.java

@@ -367,4 +367,30 @@ public class BookClockBizImpl implements BookClockBiz {
             }
         }
     }
+
+    /**
+     * 删除关联关系
+     * @param bookClockInfoId
+     * @param adviserId
+     */
+    @Override
+    @ParamLog("删除关联关系")
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteBookGroupClock(Long bookClockInfoId, Long adviserId) {
+        Map<String,Object> paramMap = new HashMap<>();
+        paramMap.put("bookClockInfoId",bookClockInfoId);
+        paramMap.put("adviserId",adviserId);
+        //删除对应关联的书及分类
+        bookGroupClockDao.deleteBookGroupClock(paramMap);
+        //删除对应的关键词
+        bookClockKeywordDao.deleteBookClockKeyword(paramMap);
+        //删除对应的基本信息
+        bookClockInfoDao.deleteBookClockInfo(paramMap);
+        //删除定时任务
+        try{
+            scheduleService.deleteJob("clockMsgConfig_" + bookClockInfoId,"book");
+        }catch (Exception e){
+            throw new BookBizException(BookBizException.ERROR,"删除定时任务失败！");
+        }
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/clock/dao/BookClockInfoDao.java

@@ -80,4 +80,10 @@ public interface BookClockInfoDao extends BaseDao<BookClockInfo> {
      * @param coverImg
      */
     void updateAppInfo(Long appId,String title,String coverImg);
+
+    /**
+     * 删除关联的基本信息
+     * @param paramMap
+     */
+    void deleteBookClockInfo(Map<String, Object> paramMap);
 }

pcloud-service-book/src/main/java/com/pcloud/book/clock/dao/BookGroupClockDao.java

@@ -64,4 +64,10 @@ public interface BookGroupClockDao extends BaseDao<BookGroupClock> {
      * @param paramMap
      */
     void cancelSelected(Map<String,Object> paramMap);
+
+    /**
+     * 删除对应关联的书及分类
+     * @param paramMap
+     */
+    void deleteBookGroupClock(Map<String,Object> paramMap);
 }

pcloud-service-book/src/main/java/com/pcloud/book/clock/dao/impl/BookClockInfoDaoImpl.java

@@ -125,5 +125,15 @@ public class BookClockInfoDaoImpl extends BaseDaoImpl<BookClockInfo> implements
         super.sqlSessionTemplate.update(getStatement("updateAppInfo"),paramMap);
     }
 
+    /**
+     * 删除关联的基本信息
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public void deleteBookClockInfo(Map<String,Object> paramMap) {
+        super.sqlSessionTemplate.delete(getStatement("deleteBookClockInfo"),paramMap);
+    }
+
 
 }

pcloud-service-book/src/main/java/com/pcloud/book/clock/dao/impl/BookGroupClockDaoImpl.java

@@ -90,4 +90,14 @@ public class BookGroupClockDaoImpl extends BaseDaoImpl<BookGroupClock> implement
     public void cancelSelected(Map<String, Object> paramMap) {
         super.sqlSessionTemplate.delete(getStatement("cancelSelected"),paramMap);
     }
+
+    /**
+     * 删除对应关联的书及分类
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public void deleteBookGroupClock(Map<String, Object> paramMap) {
+        super.sqlSessionTemplate.delete(getStatement("deleteBookGroupClock"),paramMap);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/clock/dto/BookClockInfoDTO.java

@@ -75,7 +75,7 @@ public class BookClockInfoDTO extends BaseDto {
     @ApiModelProperty("操作")
     private String operation;
 
-    @ApiModelProperty("操群ID")
+    @ApiModelProperty("群ID")
     private Long groupQrcodeId;
 
     @ApiModelProperty("创建人")

pcloud-service-book/src/main/java/com/pcloud/book/clock/facade/BookClockFacade.java

@@ -64,4 +64,11 @@ public interface BookClockFacade {
                                       @RequestParam(value = "numPerPage", required = false) Integer numPerPage)
             throws BizException, PermissionException ;
 
+    @ApiOperation(value = "删除关联信息", httpMethod = "GET")
+    @ApiImplicitParams({@ApiImplicitParam(name = "token", value = "token", dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "bookClockInfoId", value = "打卡书籍实体ID", dataType = "Long", paramType = "query")})
+    @RequestMapping(value = "deleteBookGroupClock", method = RequestMethod.GET)
+    ResponseDto<?> deleteBookGroupClock(@RequestHeader("token") String token, @RequestParam(value = "bookClockInfoId",required = false)Long bookClockInfoId)
+            throws BizException, PermissionException;
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/clock/facade/impl/BookClockFacadeImpl.java

@@ -4,6 +4,7 @@ import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.clock.biz.BookClockBiz;
 import com.pcloud.book.clock.entity.BookClockInfo;
 import com.pcloud.book.clock.facade.BookClockFacade;
+import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageParam;
@@ -65,6 +66,7 @@ public class BookClockFacadeImpl implements BookClockFacade {
      * @throws PermissionException
      */
     @Override
+    @RequestMapping(value = "updateBookGroupClock", method = RequestMethod.POST)
     public ResponseDto<?> updateBookGroupClock(@RequestHeader("token")String token, @RequestBody BookClockInfo bookClockInfo) throws BizException, PermissionException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         if(null == bookClockInfo || null == bookClockInfo.getBookClockInfoId() || StringUtil.isEmpty(bookClockInfo.getUpdateType())){
@@ -85,6 +87,7 @@ public class BookClockFacadeImpl implements BookClockFacade {
      * @throws PermissionException
      */
     @Override
+    @RequestMapping(value = "getBookGroupClockBaseInfo", method = RequestMethod.GET)
     public ResponseDto<?> getBookGroupClockBaseInfo(@RequestHeader("token")String token, @RequestParam(value = "bookClockInfoId",required = false) Long bookClockInfoId) throws BizException, PermissionException {
         SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         if(null == bookClockInfoId){
@@ -101,12 +104,14 @@ public class BookClockFacadeImpl implements BookClockFacade {
      * @throws PermissionException
      */
     @Override
+    @RequestMapping(value = "getAdviserHasSelected", method = RequestMethod.GET)
     public ResponseDto<?> getAdviserHasSelected(@RequestHeader("token") String token) throws BizException, PermissionException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         return new ResponseDto<>(bookClockBiz.getAdviserHasSelected(adviserId));
     }
 
     @Override
+    @RequestMapping(value = "listBookGroupClock4Adviser", method = RequestMethod.GET)
     public ResponseDto<?> listBookGroupClock4Adviser(@RequestHeader("token") String token,
              @RequestParam(value = "name" ,required = false) String name,
              @RequestParam(value = "startDate", required = false) String startDate,
@@ -129,5 +134,25 @@ public class BookClockFacadeImpl implements BookClockFacade {
         return new ResponseDto<>(bookClockBiz.listBookGroupClock(pageParam, paramMap));
     }
 
+    /**
+     * 删除关联信息
+     * @param token
+     * @param bookClockInfoId
+     * @return
+     * @throws BizException
+     * @throws PermissionException
+     */
+    @Override
+    @RequestMapping(value = "deleteBookGroupClock", method = RequestMethod.GET)
+    public ResponseDto<?> deleteBookGroupClock(@RequestHeader("token") String token,
+                                               @RequestParam(value = "bookClockInfoId",required = false) Long bookClockInfoId) throws BizException, PermissionException {
+        Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        if(null == bookClockInfoId){
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"参数有误！");
+        }
+        bookClockBiz.deleteBookGroupClock(bookClockInfoId,adviserId);
+        return new ResponseDto<>();
+    }
+
 
 }

pcloud-service-book/src/main/resources/mapper/clock/BookClockInfo.Mapper.xml

@@ -192,5 +192,11 @@
         AND origin_type = "APP"
     </update>
 
+    <!-- 删除关联的基本信息-->
+    <delete id="deleteBookClockInfo" parameterType="map">
+        DELETE FROM book_clock_info
+        WHERE book_clock_info_id = #{bookClockInfoId}
+    </delete>
+
 
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/clock/BookGroupClock.Mapper.xml

@@ -134,5 +134,11 @@
         AND classify_id = #{classifyId}
     </delete>
 
+    <!--删除对应关联的书及分类-->
+    <delete id="deleteBookGroupClock" parameterType="map">
+        DELETE FROM book_group_clock
+        WHERE book_clock_info_id = #{bookClockInfoId}
+    </delete>
+
 
 </mapper>
\ No newline at end of file