添加批量激活设备

device-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppPublishServiceImpl.java

@@ -51,18 +51,13 @@ public class AppPublishServiceImpl extends AbstractCRUDServiceImpl<AppPublishDao
 
     @Override
     public void active(AppPublishEntity appPublishEntity, Context context) {
-
         if( AppTypeEnum.前端.getValue()==appPublishEntity.getAppType()){
-
             String targetFilePath = uploadService.getFilePath(appPublishEntity.getFilePath());
-
-            String disPath = "/";
-
+            String disPath = "/home/publish/"+appPublishEntity.getAppCode();
             boolean directory = FileUtil.isDirectory(new File(disPath));
             if(directory){
                 FileUtil.del(new File(disPath));
             }
-
             String fileEncode ="UTF-8";
             try {
                 fileEncode = EncodeUtil.getEncode(targetFilePath,true);
@@ -70,10 +65,8 @@ public class AppPublishServiceImpl extends AbstractCRUDServiceImpl<AppPublishDao
                 log.error("异常",e);
             }
             ZipUtil.unzip(targetFilePath, disPath, Charset.forName(fileEncode));
-
-
         }else {
-
+//后端部署 执行sh 脚本程序部署
         }
 
 

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java

@@ -90,7 +90,6 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
             log.error("异常",e);
         }
         ZipUtil.unzip(targetFilePath, disPath, Charset.forName(fileEncode));
-
         //更新
         distributeEntity.setDistributeFilePath(disPath);
         distributeEntity.setDistribute(YesNoEnum.YES.getValue());

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleDistributeController.java

@@ -9,6 +9,7 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.ImageReEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.feign.skin.ISkinBaseFeign;
 import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
 import com.mortals.xhx.module.device.service.DeviceModuleDistributeService;
 import com.mortals.xhx.module.product.model.ProductEntity;
@@ -41,6 +42,9 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
     @Autowired
     private ProductService productService;
 
+    @Autowired
+    private ISkinBaseFeign skinBaseFeign;
+
     public DeviceModuleDistributeController(){
         super.setModuleDesc( "设备前端模块部署");
     }
@@ -49,6 +53,13 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "distribute", YesNoEnum.getEnumMap());
         this.addDict(model, "productId", productService.find(new ProductEntity()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getProductName())));
+
+/*        Rest<RespData<List<SkinBasePdu>>> resp = skinBaseFeign.list(new SkinBasePdu());
+        if (resp.getCode() == YesNoEnum.YES.getValue()) {
+            Map<String, Map<String, String>> skinProductCodeMap = resp.getData().getData().stream().collect(Collectors.groupingBy(x -> x.getProductCode(), Collectors.toMap(a -> a.getImageResolution() == null ? "" : a.getImageResolution()+"", b -> b.getImageResolutionValue() == null ? "" : b.getImageResolutionValue(), (o, n) -> n)));
+            this.addDict(model, "imageResolution", skinProductCodeMap);
+        }*/
+
         this.addDict(model, "imageResolution", ImageReEnum.getEnumMap());
         super.init(model, context);
     }
@@ -82,7 +93,7 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
 
         String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
         //String temp=domain+"/"+homeUrl;
-        entity.setFilePath(UrlBuilder.of(domain).addPath(homeUrl).toString());
+        entity.setFilePath(UrlBuilder.of(domain).addPath(homeUrl).build());
        // entity.setFilePath(temp);
         return super.viewAfter(id, model, entity, context);
     }