优化command为空问题

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineHeartbeatListener.java

@@ -23,6 +23,7 @@ import com.java110.utils.constant.ServiceCodeMachineTranslateConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -87,7 +88,11 @@ public class MachineHeartbeatListener extends AbstractServiceApiListener {
         Map<String, String> reqHeader = context.getRequestHeaders();
         Assert.hasKeyAndValue(reqHeader, "machinecode", "请求报文中未包含设备编码");
         Assert.hasKeyAndValue(reqHeader, "communityId", "请求报文中未包含小区信息");
-        Assert.hasKeyAndValue(reqHeader, "command", "请求报文中未包含设备编码");
+        //Assert.hasKeyAndValue(reqHeader, "command", "请求报文中未包含设备编码");
+
+        if (StringUtil.isEmpty(reqHeader.get("command"))) {
+            reqHeader.put("command", "gettask");
+        }
 
     }
 

OrderService/src/main/java/com/java110/order/OrderServiceApplicationStart.java

@@ -38,7 +38,7 @@ import java.nio.charset.Charset;
 //@EnableConfigurationProperties(EventProperties.class)
 @Java110ListenerDiscovery(listenerPublishClass = DataFlowEventPublishing.class,
         basePackages = {"com.java110.order.listener"})
-@EnableFeignClients(basePackages = {"com.java110.core.smo"})
+@EnableFeignClients(basePackages = {"com.java110.core.smo.code","com.java110.core.smo.user"})
 public class OrderServiceApplicationStart {
 
     private  static Logger logger = LoggerFactory.getLogger(OrderServiceApplicationStart.class);

OrderService/src/main/java/com/java110/order/dao/ICenterServiceDAO.java

@@ -142,6 +142,13 @@ public interface ICenterServiceDAO {
      */
     public List<Mapping> getMappingInfoAll();
 
+    /**
+     * 查询业主 添加 修改 删除订单
+     * @param info
+     * @return
+     */
+    public List<Map> queryOwenrOrders(Map info);
+
 
 
 }

OrderService/src/main/java/com/java110/order/dao/impl/CenterServiceDAOImpl.java

@@ -277,6 +277,16 @@ public class CenterServiceDAOImpl extends BaseServiceDao implements ICenterServi
         return sqlSessionTemplate.selectList("centerServiceDAOImpl.getMappingInfoAll");
     }
 
+    /**
+     * 查询业主订单
+     * @param info
+     * @return
+     */
+    @Override
+    public List<Map> queryOwenrOrders(Map info) {
+        return sqlSessionTemplate.selectList("centerServiceDAOImpl.queryOwenrOrders");
+    }
+
     /**
      * 根据oId 查询Business
      * @param info

java110-core/src/main/java/com/java110/core/smo/order/IOrderInnerServiceSMO.java

@@ -17,8 +17,8 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-/*@FeignClient(name = "order-service", configuration = {FeignConfiguration.class})
-@RequestMapping("/orderApi")*/
+@FeignClient(name = "order-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/orderApi")
 public interface IOrderInnerServiceSMO {
 
     /**

java110-db/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml

@@ -169,4 +169,12 @@
         AND co.`status_cd` NOT IN ('C')
     </select>
 
+    <!---->
+    <select id="queryOwenrOrders" parameterType="map">
+        select cb.b_id bId,co.o_id,cb.business_type_cd businessTypeCd oId  from c_orders co,c_business cb where co.o_id = cb.o_id
+        and cb.business_type_cd in ('110100030001','110100040001','110100050001')
+        and co.status_cd = ''
+
+    </select>
+
 </mapper>