Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -94,8 +94,6 @@ public class CarController extends AbstractBaseController {
     EquipmentQrcodeMapper equipmentQrcodeMapper;
     @Resource(name = "productionQRCodeFactoryMap")
     private Map<String, ProductionQRCode> messageHandMap;
-    @Autowired
-    EquipmentIotMqttReceiveConfig equipmentIotMqttReceiveConfig;
 
     @Autowired
     ICarLonAndLatDataService iCarLonAndLatDataService;
@@ -183,7 +181,6 @@ public class CarController extends AbstractBaseController {
 
 
 
-        EquipmentSpecificSerivceImpl.registerMqttTopic(car.getIotCode(), equipmentIotMqttReceiveConfig);
         car.setQrCode(QRCodeUtil.generateQRCode());
         List<CarProperty> carPropertyList = car.getCarPropertyList();
         if (carPropertyList.size() > 0) {
@@ -330,7 +327,6 @@ public class CarController extends AbstractBaseController {
         //用来解绑车辆
         jcsFeign.getUserCar(car.getId(),car.getTeamId());
 
-        EquipmentSpecificSerivceImpl.registerMqttTopic(car.getIotCode(), equipmentIotMqttReceiveConfig);
         Car oldCar = iCarService.getById(car.getId());
         Car car1 = iCarService.updateOneById(car);
         CarController controllerProxy = SpringUtils.getBean(CarController.class);
@@ -363,29 +359,6 @@ public class CarController extends AbstractBaseController {
                 syncDataService.syncDeletedFireVehicle(carIds);
                 iCarService.dataSyncDeletedIds(carIds);
             }
-            String[] topics = equipmentIotMqttReceiveConfig.adapter.getTopic();
-            boolean flag = false;
-            for (String id : idStrings) {
-                String iotCode = iCarService.getById(id).getIotCode();
-                if (StringUtil.isNotEmpty(iotCode)) {
-                    String prefix = iotCode.substring(0, 8);
-                    String suffix = iotCode.substring(8);
-                    String oldTopic = prefix + "/" + suffix + "/property";
-                    for (String topic : topics) {
-                        if (topic.equals(oldTopic)) {
-                            flag = true;
-                            break;
-                        }
-                    }
-                    if (flag) {
-                        try {
-                            equipmentIotMqttReceiveConfig.adapter.removeTopic(prefix + "/" + suffix + "/property");
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            }
 
             CarController controllerProxy = SpringUtils.getBean(CarController.class);
             controllerProxy.refreshAllCount();
@@ -1099,33 +1072,11 @@ public class CarController extends AbstractBaseController {
     public boolean delete(HttpServletRequest request, @RequestBody List<Long> idList) throws Exception {
 
         List<Car> cars = iCarService.list(new QueryWrapper<Car>().in("id", idList));
-        String[] topics = equipmentIotMqttReceiveConfig.adapter.getTopic();
         cars.forEach(car -> {
             List<EquipmentOnCarAppVO> equipmentOnCarAppVOS = carMapper.selectEquipmentOnCarAppList(car.getId());
             if (equipmentOnCarAppVOS.size() > 0) {
                 throw new BadRequest("有车载装备的车辆不能删除，请先卸载装备！");
             }
-            boolean flag = false;
-            String iotCode = car.getIotCode();
-            if (StringUtil.isNotEmpty(car.getIotCode()) && iotCode.length() > 8) {
-                String prefix = iotCode.substring(0, 8);
-                String suffix = iotCode.substring(8);
-                String oldTopic = prefix + "/" + suffix + "/property";
-                for (String topic : topics) {
-                    if (topic.equals(oldTopic)) {
-                        flag = true;
-                        break;
-                    }
-                }
-                if (flag) {
-                    try {
-                        equipmentIotMqttReceiveConfig.adapter.removeTopic(prefix + "/" + suffix + "/property");
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-
         });
         boolean flag = iCarService.removeOneByIds(idList);
         if (flag) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -283,7 +283,7 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @ApiOperation(value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestParam Long specificId) {
         EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(specificId);
-        Boolean result = equipmentSpecificSerivce.delEquipmentSpecific(specificId);
+        Boolean result = equipmentSpecificSerivce.delEquipmentBySpecificId(specificId);
         // 同步刷新，不在异步，原因速度3秒左右
         this.refreshCount(equipmentSpecific.getBizOrgCode());
         return CommonResponseUtil.success(result);
@@ -313,6 +313,9 @@ public class EquipmentSpecificController extends AbstractBaseController {
         }
         specificIds.forEach(specificId -> {
             equipmentSpecificSerivce.delEquipmentBySpecificId(specificId);
+            EquipmentSpecific equipmentSpecific = equipmentSpecificSerivce.getById(specificId);
+            // 同步刷新，不在异步，原因速度3秒左右
+            this.refreshCount(equipmentSpecific.getBizOrgCode());
         });
         return CommonResponseUtil.success();
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
-import com.sun.org.apache.bcel.internal.generic.RETURN;
-import com.yeejoin.equipmanage.common.entity.*;
-import com.yeejoin.equipmanage.common.utils.SpringUtils;
-import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
-import com.yeejoin.equipmanage.common.enums.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -27,18 +24,41 @@ import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.equipmanage.common.entity.Equipment;
+import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
+import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
+import com.yeejoin.equipmanage.common.entity.EquipmentManageEntity;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
+import com.yeejoin.equipmanage.common.entity.EquipmentSystemSourceStatistics;
+import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
+import com.yeejoin.equipmanage.common.entity.Journal;
+import com.yeejoin.equipmanage.common.entity.ManufacturerInfo;
+import com.yeejoin.equipmanage.common.entity.Stock;
+import com.yeejoin.equipmanage.common.entity.StockBill;
+import com.yeejoin.equipmanage.common.entity.StockBillDetail;
+import com.yeejoin.equipmanage.common.entity.StockDetail;
+import com.yeejoin.equipmanage.common.entity.WarehouseStructure;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
+import com.yeejoin.equipmanage.common.enums.BillContentEnum;
+import com.yeejoin.equipmanage.common.enums.EquipStatusEnum;
+import com.yeejoin.equipmanage.common.enums.JournalTypeEnum;
+import com.yeejoin.equipmanage.common.enums.NoticeEnum;
+import com.yeejoin.equipmanage.common.enums.StockBillTypeEnum;
 import com.yeejoin.equipmanage.common.utils.ExcelUtils;
 import com.yeejoin.equipmanage.common.utils.QRCodeUtil;
+import com.yeejoin.equipmanage.common.utils.SpringUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.StockDataVO;
-import com.yeejoin.equipmanage.config.EquipmentIotMqttReceiveConfig;
 import com.yeejoin.equipmanage.dto.EquipmentDetailDownloadTemplateDto;
 import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentMapper;
@@ -96,8 +116,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     private ProductionQRCode equipmentProductionQRCode;
     @Autowired
     private IEquipmentSpecificIndexSerivce iEquipmentSpecificIndexSerivce;
-    @Autowired
-    EquipmentIotMqttReceiveConfig equipmentIotMqttReceiveConfig;
+    
     @Autowired
     IManufacturerInfoService manufacturerInfoService;
 
@@ -751,9 +770,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         }).collect(Collectors.toList());
         if (!equipmentSpecificIndices.isEmpty()) {
             iEquipmentSpecificIndexSerivce.saveBatch(equipmentSpecificIndices);
-    }
-        if (equipmentSpecific.getSingle() && StringUtil.isNotEmpty(equipmentSpecific.getIotCode())) {
-            EquipmentSpecificSerivceImpl.registerMqttTopic(equipmentSpecific.getIotCode(), equipmentIotMqttReceiveConfig);
         }
     }
 

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -206,6 +206,7 @@
 					INNER JOIN  p_plan p ON pt.plan_id = p.id
 					INNER JOIN p_route r on r.id = pt.route_id
                     where pt.status = 0
+					and p.is_delete = 0
 			) a
 		<include refid="mobile-plan-task-where" />
 		<if test="orderBy != null and orderBy != ''"> order by ${orderBy}</if>
@@ -265,6 +266,7 @@
 			INNER JOIN  p_plan p ON pt.plan_id = p.id
 			INNER JOIN p_route r on r.id = pt.route_id
 			    where pt.status = 0
+				and p.is_delete = 0
 			) a
 		<include refid="mobile-plan-task-where" />
 	</select>