6.6--修改图片上传的bug，修改仓库的返回值说明

src/main/java/com/example/tdl/util/AliyunOSSClientUtil.java

@@ -249,9 +249,9 @@ public class AliyunOSSClientUtil {
                 key = FOLDER1+key;
             }else if("company".equals(imageType)){
                 key = FOLDER2+key;
-            }else if("palte".equals(imageType)){
+            }else if("truck".equals(imageType)){
                 key = FOLDER3+key;
-            }else if ("wareHouse".equals(imageType)){
+            }else if ("warehouse".equals(imageType)){
                 key = FOLDER4+key;
             }else if("circuit".equals(imageType)){
                 key = FOLDER4+key;

src/main/java/com/example/tdl/web/GatewayController.java

@@ -18,10 +18,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
@@ -460,4 +457,5 @@ public class GatewayController {
         return gson.toJson(fb);
     }
 
+
 }

src/main/java/com/example/tdl/web/PicUploadController.java

@@ -84,7 +84,7 @@ public class PicUploadController {
                         fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/userImage/" + url);
                     }else if("company".equals(imageType)){
                         fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/companyLog/" + url);
-                    }else if("palte".equals(imageType)){
+                    }else if("truck".equals(imageType)){
                         fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/palteImage/" + url);
                     }else if ("warehouse".equals(imageType)){
                         fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/wareHouseImage/" + url);
@@ -148,13 +148,12 @@ public class PicUploadController {
 //                      i =    userService.updateImg(number,img);
                       img = img +"userImage/" +url;
                     }else if("company".equals(imageType)){
-//                        i =  companyService.updateImg(number,img);
+                        i =  companyService.updateImg(number,img);
                         img = img +"companyLog/" +url;
                         fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/companyLog/" + url);
-                    }else if("palte".equals(imageType)){
-//                        i =  carService.updateImg(number,img);
+                    }else if("truck".equals(imageType)){
                         img = img +"palteImage/" +url;
-
+                        i =  carService.updateImg(img,number);
                     }else if ("warehouse".equals(imageType)) {
                         img = img + "wareHouseImage/" + url;
                         i = warehouseService.updateImg(number, img,System.currentTimeMillis());

src/main/resources/application.properties

@@ -7,7 +7,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 threadpool.corepoolsize = 30
 threadpool.maxpoolsize = 50
 
-server.port=8092
+server.port=8099
 management.security.enabled=false
 
 

src/main/resources/i18n/messages_zh_CN.properties

@@ -217,6 +217,34 @@ deleteTDLSuccess=\u5220\u9664\u7F51\u5173\u6210\u529F
 deleteTDLFailure=\u5220\u9664\u7F51\u5173\u5931\u8D25
 updateTDLCompanySuccess=\u7F51\u5173\u5206\u914D\u516C\u53F8\u6210\u529F
 updateTDLCompanyFailure=\u7F51\u5173\u5206\u914D\u516C\u53F8\u5931\u8D25
+#\u4ED3\u5E93
+warehouseName = \u4ED3\u5E93\u540D\u4E0D\u80FD\u4E3A\u7A7A
+property =\u4ED3\u5E93\u5C5E\u6027\u4E0D\u80FD\u4E3A\u7A7A
+wrongProperty = \u8BF7\u8F93\u5165\u6B63\u786E\u7684\u5C5E\u6027
+warehouseType = \u4ED3\u5E93\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+wrongWarehouseType=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u4ED3\u5E93\u7C7B\u578B
+hardwareLevel=\u786C\u4EF6\u7B49\u7EA7\u4E0D\u80FD\u4E3A\u7A7A
+wrongHardwareLevel=\u8BF7\u9009\u62E9\u6B63\u786E\u7684\u786C\u4EF6\u7B49\u7EA7
+areaIndoor=\u5BA4\u5185\u5E73\u9762\u9762\u79EF\u4E0D\u80FD\u4E3A\u7A7A
+areaRack=\u8D27\u67B6\u9762\u79EF\u4E0D\u80FD\u4E3A\u7A7A
+areaOutdoor=\u5BA4\u5916\u9762\u79EF\u4E0D\u80FD\u4E3A\u7A7A
+areaPlanIndoor=\u5B9E\u9645\u5BA4\u5185\u603B\u9762\u79EF\u4E0D\u80FD\u4E3A\u7A7A
+office=\u529E\u4E8B\u5904\u4E0D\u80FD\u4E3A\u7A7A
+timeZone=\u65F6\u533A\u4E0D\u80FD\u4E3A\u7A7A
+repeateWarehouseName=\u4ED3\u5E93\u540D\u4E0D\u80FD\u91CD\u590D
+addWarehouseSuccess = \u6DFB\u52A0\u4ED3\u5E93\u6210\u529F
+addWarehouseFailure = \u6DFB\u52A0\u4ED3\u5E93\u5931\u8D25
+warehouseNo=\u4ED3\u5E93\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
+modifiedWarehouseSuccess=\u4FEE\u6539\u4ED3\u5E93\u6210\u529F
+modifiedWarehouseFailure=\u4FEE\u6539\u4ED3\u5E93\u5931\u8D25
+Nonexistent = \u8BE5\u4ED3\u5E93\u4E0D\u5B58\u5728
+deleteWarehouseSuccess=\u4FEE\u6539\u4ED3\u5E93\u6210\u529F
+deleteWarehouseFailure=\u4FEE\u6539\u4ED3\u5E93\u5931\u8D25
+bindingGatewaySuccess = \u7ED1\u5B9A\u7F51\u5173\u6210\u529F
+bindingGatewayFailure = \u7ED1\u5B9A\u7F51\u5173\u5931\u8D25
+addAlarmContactsSuccess=\u6DFB\u52A0\u7D27\u6025\u8054\u7CFB\u4EBA\u6210\u529F
+addAlarmContactsFailure=\u6DFB\u52A0\u7D27\u6025\u8054\u7CFB\u4EBA\u5931\u8D25
+NonexistentUser = \u7528\u6237\u4E0D\u5B58\u5728
 #\u89D2\u8272
 repeatedRole=\u89D2\u8272\u5DF2\u5B58\u5728
 usedRole=\u8BE5\u89D2\u8272\u6B63\u5728\u88AB\u4F7F\u7528

src/main/resources/mapper/GatewayMapper.xml

@@ -110,7 +110,7 @@
 
     <!--根据仓库编号查询网关信息-->
     <select id="getByWarehouseNo" parameterType="String" resultType="com.example.tdl.domain.vo.GatewayOnLineVo">
-      SELECT gatewaySN SN, gatewayType  type from tdl_gateway_log  where  warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
+      SELECT DISTINCT gatewaySN SN, gatewayType  type from tdl_gateway_log  where  warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
     </select>