返回数据使用枚举

src/main/java/com/welampiot/common/InterfaceResultEnum.java

@@ -1,8 +1,24 @@
 package com.welampiot.common;
 
 public enum InterfaceResultEnum {
-    LOGIN_ERROR("0000","操作成功","Operation successful","Операция прошла успешно"),
-    LOGIN_FAIL("0001","参数异常","Parameter abnormality","Параметры аномалии");
+
+    OPERATION_SUCCESS("0000","操作成功","Operation successful","Операция прошла успешно"),
+    PARAM_FAIL("0001","参数异常","Parameter abnormality","Параметры аномалии"),
+    LACK_PARAM_ERROR("0007","缺少必要参数","",""),
+    LACK_LAMP_NUMBER_ERROR("0201","请填写灯控编号","",""),
+    LAMP_NUMBER_FORMAT_ERROR("0202","灯控编号只能包含数字跟字母","",""),
+    LAMP_NUMBER_UNIQUE_ERROR("0203","灯控编号重复","",""),
+    LACK_LAMP_NAME_ERROR("0204","请填写灯控名称","",""),
+    LAMP_NAME_UNIQUE_ERROR("0205","灯控名称重复","",""),
+    LACK_LAMP_ADDRESS_ERROR("0206","请填写灯控设备地址","",""),
+    LAMP_ADDRESS_UNIQUE_ERROR("0207","灯控设备地址重复","",""),
+    LACK_AREA_ERROR("0208","请选择区域","",""),
+    LACK_SECTION_ERROR("0209","请选择路段","",""),
+    GROUP_NAME_UNIQUE_ERROR("0210","分组名称已存在","",""),
+    GROUP_NUMBER_UNIQUE_ERROR("0211","分组编号已存在","",""),
+    LACK_GROUP_NUMBER_ERROR("0212","请填写分组编号","",""),
+    LACK_GROUP_NAME_ERROR("0213","请填写分组名称","",""),
+    ;
     private String code;
     private String msgCn;
     private String msgEn;

src/main/java/com/welampiot/configuration/ResponseConfig.java

@@ -1,19 +0,0 @@
-package com.welampiot.configuration;
-
-import com.welampiot.common.YamlPropertySourceFactory;
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-@Component
-@PropertySource(factory = YamlPropertySourceFactory.class,value = "classpath:config/response.yml", encoding = "utf-8")
-@ConfigurationProperties(prefix = "response")
-@Data
-public class ResponseConfig {
-    private Map<String,String> msgCN;
-    private Map<String,String> msgEN;
-    private Map<String,String> msgRU;
-}

src/main/java/com/welampiot/controller/ElectricBoxController.java

@@ -1,6 +1,7 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dto.AirSwitchInfoDTO;
 import com.welampiot.dto.ElectricBoxDTO;
 import com.welampiot.service.AirSwitchInfoService;
@@ -91,9 +92,9 @@ public class ElectricBoxController {
     public BaseResult<AirSwitchInfoDTO> airSwitchDetail(HttpServletRequest request){
         Integer id = request.getParameter("id") == null ? 0 : Integer.parseInt(request.getParameter("id"));
         Integer version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
-        if (id == 0) return toolUtils.response("0001",version);
+        if (id == 0) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         AirSwitchDetailVO airSwitchDetail = airSwitchInfoService.getAirSwitchDetail(id);
-        if (airSwitchDetail == null) return toolUtils.response("0001",version);
+        if (airSwitchDetail == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         return BaseResult.success(airSwitchDetail);
     }
 }

src/main/java/com/welampiot/controller/GroupController.java

@@ -1,6 +1,7 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dto.GroupDTO;
 import com.welampiot.service.GroupService;
 import com.welampiot.utils.ToolUtils;
@@ -42,7 +43,7 @@ public class GroupController{
         List sectionList = toolUtils.getSectionList(request);
         List<GroupDTO> listBySection = groupService.getListBySection(sectionList);
 
-        return toolUtils.response("0000",version,listBySection);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,listBySection);
     }
 
     /**
@@ -79,7 +80,7 @@ public class GroupController{
         groupVO1.setList(listByVO);
         groupVO1.setTotal((int)Math.ceil((double)countByVO/count));
 
-        return toolUtils.response("0000",version,groupVO1);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,groupVO1);
     }
 
     /**
@@ -91,14 +92,14 @@ public class GroupController{
     private BaseResult details(HttpServletRequest request){
         Integer version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
         Integer id = request.getParameter("id") == null ? null : Integer.parseInt(request.getParameter("id"));
-        if (id == null) return toolUtils.response("0007",version);
+        if (id == null) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
 
         GroupVO groupVO = new GroupVO();
         groupVO.setId(id);
         groupVO.setVersion(version);
         groupVO.setSectionList(toolUtils.getSectionList(request));
         GroupDTO detailByVO = groupService.getDetailByVO(groupVO);
-        return toolUtils.response("0000",version,detailByVO);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,detailByVO);
     }
 
     /**
@@ -132,7 +133,7 @@ public class GroupController{
             if (add.getCode().equals("0000")){
                 LampListResponseVO lampListResponseVO = new LampListResponseVO();
                 lampListResponseVO.setList(new ArrayList<>());
-                return toolUtils.response("0000",version,lampListResponseVO);
+                return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,lampListResponseVO);
             }else {
                 return add;
             }
@@ -151,7 +152,7 @@ public class GroupController{
             if (update.getCode().equals("0000")){
                 LampListResponseVO lampListResponseVO = new LampListResponseVO();
                 lampListResponseVO.setList(new ArrayList<>());
-                return toolUtils.response("0000",version,lampListResponseVO);
+                return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,lampListResponseVO);
             }else {
                 return update;
             }
@@ -168,9 +169,9 @@ public class GroupController{
     private BaseResult del(HttpServletRequest request){
         Integer version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
         Integer groupId = request.getParameter("groupId") == null ? null : Integer.parseInt(request.getParameter("groupId"));
-        if (groupId == 0) toolUtils.response("0007",version);
+        if (groupId == 0) toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
         groupService.deleteById(groupId);
-        return toolUtils.response("0000",version);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
     }
 
     /**
@@ -182,7 +183,7 @@ public class GroupController{
     private BaseResult workInfo(HttpServletRequest request){
         Integer version = (Integer) toolUtils.getRequestContent(request,"version",1);
         Integer groupId = (Integer) toolUtils.getRequestContent(request,"groupId",1);
-        if (groupId == 0) return toolUtils.response("0007",version);
+        if (groupId == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
         GroupVO groupVO = new GroupVO();
         groupVO.setId(groupId);
         groupVO.setVersion(version);
@@ -192,6 +193,6 @@ public class GroupController{
 //        data.put("value",group.getValue().toString());
 //        data.put("maxLight",group.getOfflight());
 //        data.put("minLight",group.getOnlight());
-        return toolUtils.response("0000",version,group);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,group);
     }
 }

src/main/java/com/welampiot/controller/LampController.java

@@ -1,6 +1,7 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.common.ResultEnum;
 import com.welampiot.dto.GroupDTO;
 import com.welampiot.dto.LampInfoDTO;
@@ -132,15 +133,15 @@ public class LampController {
         String longitude = request.getParameter("longitude") == null || request.getParameter("longitude").length() == 0 ? "0" : request.getParameter("longitude");
         String latitude = request.getParameter("latitude") == null || request.getParameter("latitude").length() == 0 ? "0" : request.getParameter("latitude");
 
-        if (number == null || number.length() == 0) return toolUtils.response("0201",version);
-        if (!number.matches("^[A-Za-z0-9]+$")) return toolUtils.response("0202",version);
+        if (number == null || number.length() == 0) return toolUtils.response(InterfaceResultEnum.LACK_LAMP_NUMBER_ERROR,version);
+        if (!number.matches("^[A-Za-z0-9_]+$")) return toolUtils.response(InterfaceResultEnum.LAMP_NUMBER_FORMAT_ERROR,version);
         String name = request.getParameter("name");
-        if (name == null || name.length() == 0) return toolUtils.response("0204",version);
+        if (name == null || name.length() == 0) return toolUtils.response(InterfaceResultEnum.LACK_LAMP_NAME_ERROR,version);
         String sn = request.getParameter("sn");
-        if (sn == null || sn.length() == 0) return toolUtils.response("0206",version);
+        if (sn == null || sn.length() == 0) return toolUtils.response(InterfaceResultEnum.LACK_LAMP_ADDRESS_ERROR,version);
 
-        if (areaId == 0) return toolUtils.response("0208",version);
-        if (sectionId == 0) return toolUtils.response("0209",version);
+        if (areaId == 0) return toolUtils.response(InterfaceResultEnum.LACK_AREA_ERROR,version);
+        if (sectionId == 0) return toolUtils.response(InterfaceResultEnum.LACK_SECTION_ERROR,version);
 
 
         if (lampId == 0){  // 添加
@@ -202,13 +203,13 @@ public class LampController {
     public BaseResult del(HttpServletRequest request){
         Integer version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
         String lampId = request.getParameter("lampId");
-        if (lampId == null || lampId.length() == 0) return toolUtils.response("0007",version);
+        if (lampId == null || lampId.length() == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
         String[] split = lampId.split(",");
         for (String id :split) {
             int l = Integer.parseInt(id);
             lampService.deleteById(l);
         }
-        return toolUtils.response("0000",version);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
     }
 
     /**
@@ -239,7 +240,7 @@ public class LampController {
 //            int l = Integer.parseInt(id);
 //            lampService.deleteById(l);
 //        }
-        return toolUtils.response("0000",version);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
     }
 
 
@@ -342,6 +343,6 @@ public class LampController {
 //        data.put("list",maps);
         LampListResponseVO lampListResponseVO1 = new LampListResponseVO();
         lampListResponseVO1.setList(list);
-        return toolUtils.response("0000",Integer.parseInt(version),lampListResponseVO1);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,Integer.parseInt(version),lampListResponseVO1);
     }
 }

src/main/java/com/welampiot/controller/LampPoleController.java

@@ -1,6 +1,8 @@
 package com.welampiot.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dto.LampInfoDTO;
 import com.welampiot.dto.LampPoleDTO;
 import com.welampiot.dto.ScreenDTO;
@@ -11,12 +13,13 @@ import com.welampiot.vo.LampPoleVO;
 import com.welampiot.vo.ListResponseVO;
 import com.welampiot.vo.ScreenDetailsVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-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.ServletException;
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -51,13 +54,13 @@ public class LampPoleController {
     public BaseResult<ScreenDTO> screenDetails(HttpServletRequest request){
         Integer id = request.getParameter("id") == null ? 0 : Integer.parseInt(request.getParameter("id"));
         Integer version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
-        if (id == 0) return toolUtils.response("0001",version);
+        if (id == 0) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         ScreenDTO dto = new ScreenDTO();
         dto.setId(id);
         dto.setSectionList(toolUtils.getSectionList(request));
 
         ScreenDetailsVO vo = screenService.getScreenDetails(dto);
-        if (vo == null) return toolUtils.response("0001",version);
+        if (vo == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         return BaseResult.success(vo);
     }
 
@@ -76,4 +79,45 @@ public class LampPoleController {
         listResponseVO.setList(navByVO);
         return BaseResult.success(listResponseVO);
     }
+
+    /**
+     * 灯杆列表
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/getlist",method = RequestMethod.POST)
+    public BaseResult<LampInfoDTO> getList(HttpServletRequest request){
+        Integer version = (Integer) toolUtils.getRequestContent(request,"version",1);
+        Integer groupId = (Integer) toolUtils.getRequestContent(request,"groupId",1);
+        ListResponseVO listResponseVO = new ListResponseVO();
+        listResponseVO.setList(new ArrayList());
+        listResponseVO.setTotal(1);
+        return BaseResult.success();
+    }
+
+    /**
+     * 添加编辑灯杆
+     * @return
+     */
+    @RequestMapping(value = "/save",method = RequestMethod.POST)
+    public BaseResult<LampInfoDTO> save(LampPoleVO form){
+//        String lightDevList = request.getParameter("lightDevList");
+        System.out.println(form.getLightDevList());
+//        System.out.println(request.getParts());
+//        System.out.println(request.getParameterMap().keySet().toString());
+////        JSONObject.fromObject(map);
+//        String s = JSONObject.toJSONString(request.getParameterMap());
+//        System.out.println(s);
+//        JSONObject jsonObject = JSONObject.parseObject(s);
+//        System.out.println(jsonObject.toJSONString());
+
+        Integer version = 0;
+//                (Integer) toolUtils.getRequestContent(request,"version",1);
+//        Integer groupId = (Integer) toolUtils.getRequestContent(request,"groupId",1);
+//        ListResponseVO listResponseVO = new ListResponseVO();
+//        listResponseVO.setList(new ArrayList());
+//        listResponseVO.setTotal(1);
+        return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
+    }
+
 }

src/main/java/com/welampiot/controller/LoopController.java

@@ -1,6 +1,7 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dto.LoopDTO;
 import com.welampiot.service.LoopService;
 import com.welampiot.utils.ToolUtils;
@@ -66,9 +67,9 @@ public class LoopController {
     public BaseResult<LoopDTO> details(HttpServletRequest request){
         Integer version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
         Integer id = request.getParameter("id") == null ? 0 : Integer.parseInt(request.getParameter("id"));
-        if (id == 0) return toolUtils.response("0001", version);
+        if (id == 0) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL, version);
         LoopDetailVO loopDetail = loopService.getLoopDetail(id, version,toolUtils.getSectionList(request));
-        if (loopDetail == null) return toolUtils.response("0001",version);
+        if (loopDetail == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         return BaseResult.success(loopDetail);
     }
 
@@ -81,7 +82,7 @@ public class LoopController {
     public BaseResult<LoopDTO> nav(HttpServletRequest request){
         Integer version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
         List sectionList = toolUtils.getSectionList(request);
-        if (sectionList == null) return toolUtils.response("0001", version);
+        if (sectionList == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL, version);
         LoopVO loopDropDownList = loopService.getLoopDropDownList(sectionList);
         LoopVO[] array = {};
         if (loopDropDownList == null) return BaseResult.success(array);

src/main/java/com/welampiot/controller/ManholeController.java

@@ -1,6 +1,7 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dto.ManholeDTO;
 import com.welampiot.service.ManholeService;
 import com.welampiot.utils.ToolUtils;
@@ -63,7 +64,7 @@ public class ManholeController {
         dto.setSectionList(toolUtils.getSectionList(request));
 
         ManholeVO vo = manholeService.getListByDTO(dto, version);
-        if (vo == null) return toolUtils.response("0001",version);
+        if (vo == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         return BaseResult.success(vo);
     }
 

src/main/java/com/welampiot/controller/MapController.java

@@ -1,6 +1,7 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dto.EnvmonitorDTO;
 import com.welampiot.dto.GroupDTO;
 import com.welampiot.service.EnvmonitorService;
@@ -51,6 +52,6 @@ public class MapController{
             groupDTO.setStatus(1);
             groupDTO.setLight(detailByDTO.getIllumination());
         }
-        return toolUtils.response("0000",version,groupDTO);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,groupDTO);
     }
 }

src/main/java/com/welampiot/controller/NewLampPoleController.java

@@ -1,6 +1,7 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dto.*;
 import com.welampiot.service.*;
 import com.welampiot.utils.ToolUtils;
@@ -135,7 +136,7 @@ public class NewLampPoleController {
 //        $data['monthCom'] = round($data['monthCom'],1);
 //        $data['totalCom'] = round($data['totalCom'],1);
 
-        return toolUtils.response("0000",version,lampPoleInfoVO);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,lampPoleInfoVO);
     }
 
     /**
@@ -183,7 +184,7 @@ public class NewLampPoleController {
         Integer version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
         Integer id = request.getParameter("id") == null ? 0 : Integer.parseInt(request.getParameter("id"));
         WifiOutInfoVO vo = wifiService.getWifiOutInfo(id, toolUtils.getSectionList(request));
-        if (vo == null) return toolUtils.response("0001",version);
+        if (vo == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         return BaseResult.success(vo);
     }
 
@@ -208,7 +209,7 @@ public class NewLampPoleController {
         dto.setSectionList(toolUtils.getSectionList(request));
 
         WifiInfoLogVO vo = wifiInfoLogService.getWifiOutStatisticsByDTO(dto);
-        if (vo == null) return toolUtils.response("0001",version);
+        if (vo == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         return BaseResult.success(vo);
     }
 
@@ -301,13 +302,13 @@ public class NewLampPoleController {
     public BaseResult delLog(HttpServletRequest request){
         Integer version = request.getParameter("version") == null ? 0 : Integer.parseInt(request.getParameter("version"));
         String logId = request.getParameter("logId");
-        if (logId == null || logId.length() == 0) return toolUtils.response("0007",version);
+        if (logId == null || logId.length() == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
         String[] split = logId.split(",");
         for (String id :split) {
             int l = Integer.parseInt(id);
             operationLogService.deleteLogListById(l);
         }
-        return toolUtils.response("0000",version);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
     }
 
 }

src/main/java/com/welampiot/controller/PolicyController.java

@@ -1,6 +1,7 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dto.GroupDTO;
 import com.welampiot.dto.PolicyDTO;
 import com.welampiot.dto.UserDTO;
@@ -88,7 +89,7 @@ public class PolicyController{
         listResponseVO.setList(listByVO);
         listResponseVO.setTotal((int)Math.ceil((double)countByVO/count));
 
-        return toolUtils.response("0000",version,listResponseVO);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,listResponseVO);
     }
 
     /**
@@ -147,6 +148,6 @@ public class PolicyController{
         }
         ListResponseVO listResponseVO = new ListResponseVO();
         listResponseVO.setList(list);
-        return toolUtils.response("0000",version,listResponseVO);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,listResponseVO);
     }
 }

src/main/java/com/welampiot/service/impl/GroupServiceImpl.java

@@ -1,6 +1,7 @@
 package com.welampiot.service.impl;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dao.GroupDao;
 import com.welampiot.dto.GroupDTO;
 import com.welampiot.service.GroupService;
@@ -109,11 +110,11 @@ public class GroupServiceImpl implements GroupService {
         GroupDTO groupDTO1 = new GroupDTO();
         groupDTO1.setNumber(groupDTO.getNumber());
         groupDTO1.setSectionId(groupDTO.getSectionId());
-        if (this.checkData(groupDTO1) > 0) return toolUtils.response("0211",groupDTO.getVersion());
+        if (this.checkData(groupDTO1) > 0) return toolUtils.response(InterfaceResultEnum.GROUP_NUMBER_UNIQUE_ERROR,groupDTO.getVersion());
         groupDTO1 = new GroupDTO();
         groupDTO1.setName(groupDTO.getName());
         groupDTO1.setSectionId(groupDTO.getSectionId());
-        if (this.checkData(groupDTO1) > 0) return toolUtils.response("0210",groupDTO.getVersion());
+        if (this.checkData(groupDTO1) > 0) return toolUtils.response(InterfaceResultEnum.GROUP_NAME_UNIQUE_ERROR,groupDTO.getVersion());
 
         Date endDate = new Date(System.currentTimeMillis());
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -123,7 +124,7 @@ public class GroupServiceImpl implements GroupService {
 
         groupDao.add(groupDTO);
 
-        return toolUtils.response("0000",groupDTO.getVersion());
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,groupDTO.getVersion());
     }
 
     @Override
@@ -132,12 +133,12 @@ public class GroupServiceImpl implements GroupService {
         groupDTO1.setId(groupDTO.getId());
         groupDTO1.setNumber(groupDTO.getNumber());
         groupDTO1.setSectionId(groupDTO.getSectionId());
-        if (this.checkData(groupDTO1) > 0) return toolUtils.response("0211",groupDTO.getVersion());
+        if (this.checkData(groupDTO1) > 0) return toolUtils.response(InterfaceResultEnum.GROUP_NUMBER_UNIQUE_ERROR,groupDTO.getVersion());
         groupDTO1 = new GroupDTO();
         groupDTO1.setId(groupDTO.getId());
         groupDTO1.setName(groupDTO.getName());
         groupDTO1.setSectionId(groupDTO.getSectionId());
-        if (this.checkData(groupDTO1) > 0) return toolUtils.response("0210",groupDTO.getVersion());
+        if (this.checkData(groupDTO1) > 0) return toolUtils.response(InterfaceResultEnum.GROUP_NAME_UNIQUE_ERROR,groupDTO.getVersion());
         Date endDate = new Date(System.currentTimeMillis());
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String createTime = simpleDateFormat.format(endDate).toString();
@@ -145,7 +146,7 @@ public class GroupServiceImpl implements GroupService {
 
         groupDao.update(groupDTO);
 
-        return toolUtils.response("0000",groupDTO.getVersion());
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,groupDTO.getVersion());
     }
 
     @Override

src/main/java/com/welampiot/service/impl/LampServiceImpl.java

@@ -1,6 +1,7 @@
 package com.welampiot.service.impl;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.configuration.LampConfig;
 import com.welampiot.dao.LampDao;
 import com.welampiot.dto.LampInfoDTO;
@@ -133,15 +134,15 @@ public class LampServiceImpl implements LampService {
     public BaseResult add(LampInfoDTO lampInfoDTO) {
         LampInfoDTO lampInfoDTO1 = new LampInfoDTO();
         lampInfoDTO1.setSn(lampInfoDTO.getSn());
-        if (lampDao.findByVO(lampInfoDTO1) > 0) return toolUtils.response("0207",lampInfoDTO.getVersion());
+        if (lampDao.findByVO(lampInfoDTO1) > 0) return toolUtils.response(InterfaceResultEnum.LAMP_ADDRESS_UNIQUE_ERROR,lampInfoDTO.getVersion());
         lampInfoDTO1 = new LampInfoDTO();
         lampInfoDTO1.setNumber(lampInfoDTO.getNumber());
         lampInfoDTO1.setSectionId(lampInfoDTO.getSectionId());
-        if (lampDao.findByVO(lampInfoDTO1) > 0) return toolUtils.response("0203",lampInfoDTO.getVersion());
+        if (lampDao.findByVO(lampInfoDTO1) > 0) return toolUtils.response(InterfaceResultEnum.LAMP_NUMBER_UNIQUE_ERROR,lampInfoDTO.getVersion());
         lampInfoDTO1 = new LampInfoDTO();
         lampInfoDTO1.setName(lampInfoDTO.getName());
         lampInfoDTO1.setSectionId(lampInfoDTO.getSectionId());
-        if (lampDao.findByVO(lampInfoDTO) > 0) return toolUtils.response("0205",lampInfoDTO.getVersion());
+        if (lampDao.findByVO(lampInfoDTO) > 0) return toolUtils.response(InterfaceResultEnum.LAMP_NAME_UNIQUE_ERROR,lampInfoDTO.getVersion());
 
         NetworkDTO networkDTO = new NetworkDTO();
         networkDTO.setNetworkName(lampInfoDTO.getSn());
@@ -168,7 +169,7 @@ public class LampServiceImpl implements LampService {
             lampInfoDTO.setMode(0);
             lampDao.add(lampInfoDTO);
         }
-        return toolUtils.response("0000",lampInfoDTO.getVersion());
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,lampInfoDTO.getVersion());
     }
 
     @Override
@@ -180,17 +181,17 @@ public class LampServiceImpl implements LampService {
         lampInfoDTO1.setSn(lampInfoDTO.getSn());
         lampInfoDTO1.setId(lampInfoDTO.getId());
         lampInfoDTO1.setNetworkId(lampInfoDTO.getNetworkId());
-        if (this.checkData(lampInfoDTO1) > 0) return toolUtils.response("0207",lampInfoDTO.getVersion());
+        if (this.checkData(lampInfoDTO1) > 0) return toolUtils.response(InterfaceResultEnum.LAMP_ADDRESS_UNIQUE_ERROR,lampInfoDTO.getVersion());
         lampInfoDTO1 = new LampInfoDTO();
         lampInfoDTO1.setNetworkId(lampInfoDTO.getNetworkId());
         lampInfoDTO1.setNumber(lampInfoDTO.getNumber());
         lampInfoDTO1.setSectionId(lampInfoDTO.getSectionId());
-        if (this.checkData(lampInfoDTO1) > 0) return toolUtils.response("0203",lampInfoDTO.getVersion());
+        if (this.checkData(lampInfoDTO1) > 0) return toolUtils.response(InterfaceResultEnum.LAMP_NUMBER_UNIQUE_ERROR,lampInfoDTO.getVersion());
         lampInfoDTO1 = new LampInfoDTO();
         lampInfoDTO1.setNetworkId(lampInfoDTO.getNetworkId());
         lampInfoDTO1.setName(lampInfoDTO.getName());
         lampInfoDTO1.setSectionId(lampInfoDTO.getSectionId());
-        if (this.checkData(lampInfoDTO) > 0) return toolUtils.response("0205",lampInfoDTO.getVersion());
+        if (this.checkData(lampInfoDTO) > 0) return toolUtils.response(InterfaceResultEnum.LAMP_NAME_UNIQUE_ERROR,lampInfoDTO.getVersion());
 
 
         if (oldLamp.getProtocolType() != lampInfoDTO.getProtocolType()){
@@ -244,7 +245,7 @@ public class LampServiceImpl implements LampService {
                 }
             }
         }
-        return toolUtils.response("0000",lampInfoDTO.getVersion());
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,lampInfoDTO.getVersion());
     }
 
     @Override

src/main/java/com/welampiot/utils/ToolUtils.java

@@ -1,8 +1,8 @@
 package com.welampiot.utils;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.configuration.MqttConfig;
-import com.welampiot.configuration.ResponseConfig;
 import com.welampiot.dto.GlobalLocationDTO;
 import com.welampiot.dto.SectionDTO;
 import com.welampiot.dto.UserDTO;
@@ -30,8 +30,6 @@ public class ToolUtils {
     @Autowired
     private GlobalLocationService globalLocationService;
     @Autowired
-    private ResponseConfig responseConfig;
-    @Autowired
     private MqttConfig mqttConfig;
     @Autowired
     private MqttHandler mqttHandler;
@@ -134,15 +132,20 @@ public class ToolUtils {
      * @param version 语言类型 0 中文，1 英文，2 俄语
      * @return
      */
-    public BaseResult response(String code,Integer version){
+    public BaseResult response(InterfaceResultEnum resultEnum,Integer version){
         String msg;
+        String code = resultEnum.getCode();
         if (version == 0){
-            msg = responseConfig.getMsgCN().containsKey(code) ? responseConfig.getMsgCN().get(code) : "";
+            msg = resultEnum.getMsgCn();
+//            msg = responseConfig.getMsgCN().containsKey(code) ? responseConfig.getMsgCN().get(code) : "";
         } else if (version == 1) {
-            msg = responseConfig.getMsgEN().containsKey(code) ? responseConfig.getMsgEN().get(code) : "";
+            msg = resultEnum.getMsgEn();
+//            msg = responseConfig.getMsgEN().containsKey(code) ? responseConfig.getMsgEN().get(code) : "";
         }else {
-            msg = responseConfig.getMsgRU().containsKey(code) ? responseConfig.getMsgRU().get(code) : "";
+            msg = resultEnum.getMsgRu();
+//            msg = responseConfig.getMsgRU().containsKey(code) ? responseConfig.getMsgRU().get(code) : "";
         }
+//        InterfaceResultEnum.LOGIN_ERROR.getCode();
         return new BaseResult<>(code,msg,new Object());
     }
 
@@ -153,14 +156,18 @@ public class ToolUtils {
      * @param obj 返回数据内容
      * @return
      */
-    public BaseResult response(String code,Integer version,Object obj){
+    public BaseResult response(InterfaceResultEnum resultEnum,Integer version,Object obj){
         String msg;
+        String code = resultEnum.getCode();
         if (version == 0){
-            msg = responseConfig.getMsgCN().containsKey(code) ? responseConfig.getMsgCN().get(code) : "";
+            msg = resultEnum.getMsgCn();
+//            msg = responseConfig.getMsgCN().containsKey(code) ? responseConfig.getMsgCN().get(code) : "";
         } else if (version == 1) {
-            msg = responseConfig.getMsgEN().containsKey(code) ? responseConfig.getMsgEN().get(code) : "";
+            msg = resultEnum.getMsgEn();
+//            msg = responseConfig.getMsgEN().containsKey(code) ? responseConfig.getMsgEN().get(code) : "";
         }else {
-            msg = responseConfig.getMsgRU().containsKey(code) ? responseConfig.getMsgRU().get(code) : "";
+            msg = resultEnum.getMsgRu();
+//            msg = responseConfig.getMsgRU().containsKey(code) ? responseConfig.getMsgRU().get(code) : "";
         }
         return new BaseResult<>(code,msg,obj);
     }

src/main/java/com/welampiot/vo/LampPoleVO.java

@@ -1,12 +1,28 @@
 package com.welampiot.vo;
 
+import com.welampiot.dto.LampInfoDTO;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 @Data
-public class LampPoleVO {
+public class LampPoleVO implements Serializable {
     private List sectionList; // 路段筛选
     private Integer devType;
     private Integer devId;
+    private List<Map> lightDevList;
+    private List<Map> benchDevList;
+    private List<Map> solarDevList;
+    private Integer id;
+    private String name;
+    private String number;
+    private Integer areaId;
+    private Integer sectionId;
+    private Integer height;
+    private String install_date;
+    private String expiration_date;
+    private WifiVO cloud_box;
+    private List<Map> videoList;
 }

src/main/java/com/welampiot/vo/WifiVO.java

@@ -31,4 +31,17 @@ public class WifiVO implements Serializable {
     private List<WifiDTO> list;
 
     private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    private String sn;
+    private int model;
+    private String ip_addr;
+    private String remark1;
+    private String remark2;
+    private String remark3;
+    private String remark4;
+    private String remark5;
+    private String remark6;
+    private String install_date;
+    private String expiration_date;
 }

src/main/resources/config/response.yml

@@ -1,22 +0,0 @@
-response:
-  msgCN: {'0000': '操作成功',
-          '0001': '参数异常',
-          '0007': '缺少必要参数',
-          '0201': '请填写灯控编号',
-          '0202': '灯控编号只能包含数字跟字母',
-          '0203': '灯控编号重复',
-          '0204': '请填写灯控名称',
-          '0205': '灯控名称重复',
-          '0206': '请填写灯控设备地址',
-          '0207': '灯控设备地址重复',
-          '0208': '请选择区域',
-          '0209': '请选择路段',
-          '0210': '分组名称已存在',
-          '0211': '分组编号已存在',
-          '0212': '请填写分组编号',
-          '0213': '请填写分组名称',
-  }
-  msgEN: { '0000': 'Operation successful',
-           '0001': 'Parameter abnormality' }
-  msgRU: { '0000': 'Операция прошла успешно',
-           '0001': 'Параметры аномалии' }

src/main/resources/prod/application.yml

@@ -1,7 +1,7 @@
 server:
   port: 8088
   servlet:
-    context-path: /welampiot
+    context-path: /api
 
 spring:
   # 指定哪个文件，比如dev.yml local.yml
@@ -21,12 +21,8 @@ spring:
       filters: config
       connect-properties:
         config.decrypt: true
-<<<<<<< HEAD:src/main/resources/prod/application.yml
-#        config.decrypt.key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI5wh9Y/+kW7LK1jgUTygp2wk5uVUucBheqNDeKPAKH/orx1r1GF4mcFgfaBYO/hyVJC7Gk3xf6ypKd2MCrFRXsCAwEAAQ==
-        config.decrypt.key: ${spring.datasource.druid.publickey}
-=======
         config.decrypt.key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI5wh9Y/+kW7LK1jgUTygp2wk5uVUucBheqNDeKPAKH/orx1r1GF4mcFgfaBYO/hyVJC7Gk3xf6ypKd2MCrFRXsCAwEAAQ==
-  #      config.decrypt.key: ${spring.datasource.druid.publickey}
+#        config.decrypt.key: ${publickey}
 #  jackson:
 #    serialization:
 #      write-null-map-values: true
@@ -42,8 +38,6 @@ welampiot:
     password: admin
     timeout: 10
     keepalive: 20
-
->>>>>>> 88427924a01a77a4971f067c9a1b13afdc761b62:src/main/resources/application-prod.yml
 mybatis:
   mapper-locations: classpath:/mapper/*.xml
   check-config-location: true

src/main/resources/test/application.yml

@@ -1,7 +1,7 @@
 server:
   port: 8088
   servlet:
-    context-path: /welampiot
+    context-path: /api
 
 spring:
   application: