修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -7,8 +7,8 @@ import com.huaxu.client.UserCenterClient;
 import com.huaxu.common.ConvertXY;
 import com.huaxu.common.FileUploadUtil;
 import com.huaxu.common.MyPoint;
+import com.huaxu.common.RxcException;
 import com.huaxu.entity.Message;
-import com.huaxu.evaluation.service.EvaluationCycleService;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
@@ -45,6 +45,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -84,6 +85,9 @@ public class WorkOrderManageController {
     @Value("${UMIS.sys_video_path}")
     private String videoDir;
 
+    @Value("{UMIS.sys_app_package_path}")
+    private String appPackageDir;
+
     /**select
      * 新增一条数据
      *
@@ -355,6 +359,38 @@ public class WorkOrderManageController {
         return new AjaxMessage<>(ResultStatus.OK, avatar);
     }
 
+    @ApiOperation(value = "上传APP安装包")
+    @RequestMapping(value = "addAppPackage", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxMessage<String> addAppPackage(@ApiParam(value = "上传APP安装包", required = true) @RequestParam("avatarfile") MultipartFile file) {
+        String avatar = "";
+        if (!file.isEmpty()) {
+            try {
+                //上传简单文件名
+                String originalFilename = file.getOriginalFilename();
+                String suffixName = originalFilename.substring(originalFilename.lastIndexOf("."));
+                //存储路径
+                if(!suffixName.toLowerCase().equals("apk")||!suffixName.toLowerCase().equals("ipa")){
+                    new AjaxMessage<>(ResultStatus.ERROR, "上传文件类型不正确");
+                }
+                long size = file.getSize();
+                if (size >  1024 * 1024 * 200) {
+                    throw new RxcException("10004", "文件不能超过200M");
+                }
+                avatar = new StringBuffer(appPackageDir).append(originalFilename).toString();
+                File dest = new File(avatar);
+                if(!dest.getParentFile().exists()){
+                    dest.getParentFile().mkdirs();
+                }
+                file.transferTo(new File(avatar));
+            } catch (IOException e) {
+                return new AjaxMessage<>(ResultStatus.ERROR, e.getMessage());
+            }
+        }
+        return new AjaxMessage<>(ResultStatus.OK, avatar);
+    }
+
+
     @GetMapping("/event/select")
     @ApiOperation(value = "查询事件隐患/所有工单")
     public AjaxMessage<Pagination<WorkOrderManageDto>> selectEvent(

operation_manager/src/main/resources/application-dev.properties

@@ -84,6 +84,7 @@ spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 UMIS.sys_config_path=/UMIS_USER_IMAGES/
 UMIS.sys_excel_path=/UMIS_USER_EXCEL/
 UMIS.sys_video_path=/UMIS_USER_VIDEOS/
+UMIS.sys_app_package_path=/UMIS_USER_APP_PACKAGE/
 wf.svg.file.path=D:/test/
 
 #=====================ÐÂÔö²ÎÊýÏ̳߳ØÅäÖÃ

operation_manager/src/main/resources/application-prd.properties

@@ -85,6 +85,7 @@ spring.cloud.nacos.discovery.server-addr=10.0.0.136:8848
 UMIS.sys_config_path=/UMIS_USER_IMAGES/
 UMIS.sys_excel_path=/UMIS_USER_EXCEL/
 UMIS.sys_video_path=/UMIS_USER_VIDEOS/
+UMIS.sys_app_package_path=/UMIS_USER_APP_PACKAGE/
 wf.svg.file.path=D:/test/
 
 # 设置 feign 客户端超时时间（OpenFeign 默认支持 ribbon）

operation_manager/src/main/resources/application-sit.properties

@@ -82,8 +82,9 @@ dispath.queue=dispathTest1
 #nacos
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 UMIS.sys_config_path=/UMIS_USER_IMAGES/
-UMIS.sys_excel_path=/UMIS_USER_EXCEL/
-UMIS.sys_video_path=/UMIS_USER_VIDEOS/
+UMIS.sys_excel_path=/UMIS_USER_EXCEL
+UMIS.sys_video_path=/UMIS_USER_VIDEOS//
+UMIS.sys_app_package_path=/UMIS_USER_APP_PACKAGE/
 wf.svg.file.path=D:/test/
 
 # 设置 feign 客户端超时时间（OpenFeign 默认支持 ribbon）

user_center/src/main/java/com/huaxu/controller/VerManageController.java

@@ -2,11 +2,12 @@ package com.huaxu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huaxu.entity.App;
+
+import com.huaxu.entity.Dict;
 import com.huaxu.entity.UserEntity;
 import com.huaxu.entity.VerManageEntity;
 import com.huaxu.model.*;
-import com.huaxu.service.AppService;
+import com.huaxu.service.DictService;
 import com.huaxu.service.UserService;
 import com.huaxu.service.VerManageService;
 import com.huaxu.util.UserUtil;
@@ -14,12 +15,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.StringUtils;
+
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,6 +43,9 @@ public class VerManageController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private DictService dictService;
+
     /**
      * 查询app版本信息
      * @return 单条数据
@@ -128,10 +131,17 @@ public class VerManageController {
                 }
                 List<UserEntity> userEntityList=userService.findUserIdsByUserIds(idList);
                 Map<Long,String> userMap = userEntityList.stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getUsername));
-                Map<Long,String> userPhoneMap = userEntityList.stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getPhone));
+                String parentDictCodes="SYSTEM_PRODUCT_TYPE";
+                Map<String,String> dictMap=new HashMap<>();
+                for(String parentDictCode:parentDictCodes.split(",")){
+                    Dict dict=new Dict();
+                    dict.setParentDictCode(parentDictCode);
+                    dictMap.putAll(dictService.selectList(dict).stream().collect(Collectors.toMap(Dict::getDictCode, Dict::getDictValue)));
+                }
                 for(int i = 0; i < result.size(); i++) {
                     VerManageEntity verManage = result.get(i);
                     try {
+                        verManage.setProductTypeName(dictMap.get(verManage.getProductType()));
                         if (verManage.getCreateBy() != null) {
                             verManage.setCreateByName(userMap.get(Long.valueOf(verManage.getCreateBy())));
                         }

user_center/src/main/java/com/huaxu/entity/VerManageEntity.java

@@ -80,6 +80,10 @@ public class VerManageEntity implements Serializable {
     @ApiModelProperty(value = "产品类型")
     private String productType;
 
+    /** 产品类型 */
+    @ApiModelProperty(value = "产品类型名称")
+    private String productTypeName;
+
     /** 强制升级版本 */
     @ApiModelProperty(value = "强制升级版本")
     private String forcedUpgradeVer;

user_center/src/main/java/com/huaxu/service/VerManageService.java

@@ -1,36 +1,18 @@
 package com.huaxu.service;
 
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaxu.common.ToolUtil;
-import com.huaxu.dao.OrgMapper;
-import com.huaxu.dao.UserMapper;
 import com.huaxu.dao.VerManageMapper;
-import com.huaxu.dto.MaintainerCountDto;
-import com.huaxu.dto.UserListDto;
+
 import com.huaxu.entity.*;
-import com.huaxu.model.LoginUser;
-import com.huaxu.util.ByteArrayUtils;
-import com.huaxu.util.RedisUtil;
-import com.huaxu.util.UserUtil;
-import org.apache.ibatis.annotations.Param;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
+
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
+
 
 /**
  *