Merge remote-tracking branch 'origin/dev'

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/controller/CurriculumController.java

@@ -5,6 +5,7 @@ import com.usoftchina.smartschool.base.Result;
 import com.usoftchina.smartschool.page.PageDefault;
 import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.basic.service.CurriculumService;
+import com.usoftchina.smartschool.school.dto.BatchDealBaseDTO;
 import com.usoftchina.smartschool.school.dto.CurriculumFormDTO;
 import com.usoftchina.smartschool.school.dto.CurriculumListDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
@@ -51,6 +52,12 @@ public class CurriculumController {
         return Result.success();
     }
 
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO baseDTOs){
+        curriculumService.batchDelete(baseDTOs);
+        return Result.success();
+    }
+
     //导入保存至列表
     @PostMapping("/saveToFormal")
     public Result saveToFormal(Integer id, boolean update) {

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/CurriculumService.java

@@ -2,10 +2,7 @@ package com.usoftchina.smartschool.school.basic.service;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.smartschool.page.PageRequest;
-import com.usoftchina.smartschool.school.dto.CurriculumFormDTO;
-import com.usoftchina.smartschool.school.dto.CurriculumListDTO;
-import com.usoftchina.smartschool.school.dto.DocBaseDTO;
-import com.usoftchina.smartschool.school.dto.ListReqDTO;
+import com.usoftchina.smartschool.school.dto.*;
 
 /**
  * @Author chenwei
@@ -46,6 +43,12 @@ public interface CurriculumService {
      */
     void deleteDetail(Long id);
 
+    /**
+     * 批量删除
+     * @param batchDealBaseDTO
+     */
+    void batchDelete(BatchDealBaseDTO batchDealBaseDTO);
+
     /**
      * 导入保存至列表
      * @param id

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/CurriculumServiceImpl.java

@@ -203,6 +203,18 @@ public class CurriculumServiceImpl implements CurriculumService {
         messageLogService.deleteDetail(new DocBaseDTO(id, CODE, NAME));
     }
 
+    @Override
+    public void batchDelete(BatchDealBaseDTO batchDealBaseDTO){
+        if (null == batchDealBaseDTO || null == batchDealBaseDTO.getBaseDTOs() ||
+                batchDealBaseDTO.getBaseDTOs().size() == 0) {
+            return;
+        }
+
+        for (DocBaseDTO base : batchDealBaseDTO.getBaseDTOs()) {
+            delete(base.getId());
+        }
+    }
+
     @Override
     @Transactional
     public void saveToFormal(Integer id, boolean update){

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/config/RabbitConfig.java

@@ -2,6 +2,13 @@ package com.usoftchina.smartschool.wechat.config;
 
 
 import org.springframework.amqp.core.*;
+import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.support.converter.ContentTypeDelegatingMessageConverter;
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -70,4 +77,30 @@ public class RabbitConfig {
     Binding delayBind(Queue createDelayQueue, TopicExchange createExchange) {
         return BindingBuilder.bind(createDelayQueue).to(createExchange).with(delayKey);
     }
+
+    @Bean
+    public RabbitAdmin rabbitTemplate(ConnectionFactory connectionFactory) {
+        return new RabbitAdmin(connectionFactory);
+    }
+
+    @Bean
+    public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory, MessageConverter messageConverter) {
+        RabbitTemplate template = new RabbitTemplate(connectionFactory);
+        template.setMessageConverter(messageConverter);
+        return template;
+    }
+
+    @Bean
+    public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory(ConnectionFactory connectionFactory, MessageConverter messageConverter) {
+        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
+        factory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
+        factory.setConnectionFactory(connectionFactory);
+        factory.setMessageConverter(messageConverter);
+        return factory;
+    }
+
+    @Bean
+    public MessageConverter messageConverter() {
+        return new ContentTypeDelegatingMessageConverter(new Jackson2JsonMessageConverter());
+    }
 }

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/service/impl/WxPushServiceImpl.java

@@ -2,12 +2,14 @@ package com.usoftchina.smartschool.wechat.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.github.kevinsawicki.http.HttpRequest;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import com.usoftchina.smartschool.base.Result;
 import com.usoftchina.smartschool.wechat.po.MessageInfo;
 import com.usoftchina.smartschool.wechat.service.WxPushService;
 import com.usoftchina.smartschool.wechat.wxUtils.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -102,6 +104,13 @@ public class WxPushServiceImpl implements WxPushService{
                     .send(json.getBytes());
             String result= hRequest.body();
             logger.info("result={}", result);
+            /**
+              result={"errcode":0,"errmsg":"ok","msgid":716510485381890048}
+             */
+           /* if ("ok".equals(JSON.parseObject(result).getString("errmsg"))) {
+                return Result.success();
+            }
+            return Result.error(JSON.parseObject(result).getString("errmsg"));*/
             if (result.equals("error")) {
                 Result.error(result);
             }