Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

pom.xml

@@ -73,10 +73,10 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
+<!--                <nacos.server>127.0.0.1:8848</nacos.server>-->
+<!--                <logstash.address>127.0.0.1:4560</logstash.address>-->
                 <nacos.server>47.109.37.87:8848</nacos.server>
                 <logstash.address>47.109.37.87:4560</logstash.address>
-<!--                <nacos.server>47.109.37.87:8848</nacos.server>-->
-<!--                <logstash.address>47.109.37.87:4560</logstash.address>-->
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java

@@ -44,7 +44,7 @@ public class CleanOrderBo extends BaseEntity {
     /**
      * 保洁id
      */
-    @NotNull(message = "保洁id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "保洁id不能为空", groups = { AddGroup.class, EditGroup.class })
     private List<Long> cleanIds;
 
 //    /**
@@ -56,7 +56,6 @@ public class CleanOrderBo extends BaseEntity {
     /**
      * 单价
      */
-    @NotNull(message = "单价不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long prices;
 
     /**

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java

@@ -74,6 +74,7 @@ public class CleanOrderVo implements Serializable {
     private Long sumPeices;
 
     /**
+     *
      * 支付状态
      */
     @ExcelProperty(value = "支付状态")

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java

@@ -48,7 +48,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
      * @return 保洁订单
      */
     @Override
-    public CleanOrderVo queryById(Long id){
+    public CleanOrderVo queryById(Long id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -77,6 +77,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
         LambdaQueryWrapper<CleanOrder> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
+
     private LambdaQueryWrapper<CleanOrder> buildQueryWrapper(CleanOrderBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CleanOrder> lqw = Wrappers.lambdaQuery();
@@ -115,13 +116,23 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
         if (flag) {
             bo.setId(add.getId());
             ArrayList<CleanserverOrder> cleanserverOrders = new ArrayList<>();
-            for (Long cleanId : bo.getCleanIds()) {
+            LambdaQueryWrapper<CleanserverOrder> queryWrapper = new LambdaQueryWrapper<>();
-                CleanserverOrder cleanserverOrder = new CleanserverOrder();
+            // 查询cleanserver_order表中的所有记录
-                cleanserverOrder.setCleanServerId(cleanId);
+            List<CleanserverOrder> cleanserverOrderList = cleanserverOrderMapper.selectList(queryWrapper);
-                cleanserverOrder.setOrderId(add.getId());
+            //判断是否有cleanserver表中的数据
-                CleanserverOrder convert = MapstructUtils.convert(cleanserverOrder, CleanserverOrder.class);
+            if (!cleanserverOrderList.isEmpty()) {
-                cleanserverOrders.add(convert);
+                // 循环插入cleanserver_order表
+                for (CleanserverOrder order : cleanserverOrderList) {
+                    Long cleanId = order.getCleanServerId();
+                    CleanserverOrder cleanserverOrder = new CleanserverOrder();
+                    cleanserverOrder.setCleanServerId(cleanId);
+                    cleanserverOrder.setOrderId(add.getId());
+//                    CleanserverOrder convert = MapstructUtils.convert(cleanserverOrder, CleanserverOrder.class);
+                    cleanserverOrders.add(cleanserverOrder);
+                }
             }
+
+
             cleanserverOrderMapper.insert(cleanserverOrders);
 
         }
@@ -144,7 +155,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(CleanOrder entity){
+    private void validEntityBeforeSave(CleanOrder entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -157,7 +168,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;