设备信息修改

fengxiang

2018-05-08 7be408b1ce28b70005cdf147f9c41065ddc43dea

 src/main/java/com/moral/controller/MobileController.java

@@ -2,6 +2,7 @@


import static com.moral.common.util.WebUtils.getParametersStartingWith;



import java.util.HashMap;

import java.util.List;

import java.util.Map;



@@ -9,20 +10,16 @@
import javax.servlet.http.HttpServletRequest;



import com.moral.common.util.Crypto;

import com.moral.entity.*;

import com.moral.entity.adapter.EquDeviceAdapter;

import com.moral.service.*;

import com.moral.util.MessageUtils;

import com.taobao.api.ApiException;

import org.apache.commons.lang3.StringUtils;

import org.springframework.cglib.beans.BeanMap;

import org.springframework.web.bind.annotation.*;



import com.moral.common.bean.AppData;

import com.moral.entity.Device;

import com.moral.entity.MonitorPoint;

import com.moral.entity.OperateUser;

import com.moral.entity.Organization;

import com.moral.service.DeviceService;

import com.moral.service.MonitorPointService;

import com.moral.service.OperateUserService;

import com.moral.service.OrganizationService;



/**

 * The Class MobileController.

@@ -48,6 +45,9 @@
   @Resource

   private MonitorPointService monitorPointService;



   @Resource

   private ProfessionService professionService;



   /**

    * Mobile login.登录

    *

@@ -55,7 +55,7 @@
    * @param password the password

    * @return the result bean

    */

   @PostMapping("accountlogin")

   @RequestMapping("accountlogin")

   public AppData<OperateUser> mobileLogin(String username, String password) {

      OperateUser operateUser = operateUserService.mobileLogin(username,password);

      return new AppData<OperateUser>(operateUser); 

@@ -69,21 +69,20 @@
    * @param newpassword the newpassword

    * @return the result bean

    */

   @PostMapping("upPassword")

   @RequestMapping("upPassword")

   public AppData<OperateUser> updatePassword(Integer uid, String password, String newpassword) {

      OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword);

      return new AppData<OperateUser>(operateUser); 

   }



   /**

    * Install device.终端采集

    *

    * @param device the device

    * @return the result bean

    * @param equDeviceAdapter

    * @return

    */

   @PostMapping("reportDevice")

   public AppData<String> installDevice(Device device) {

      deviceService.saveOrUpdateDevice(device);

   @RequestMapping("reportDevice")

   public AppData<String> installDevice(EquDeviceAdapter equDeviceAdapter) {

      deviceService.saveOrUpdateDevice(equDeviceAdapter.toDevice());

      return new AppData<String>("");

   }



@@ -95,7 +94,7 @@
    * @param pageSize the page size

    * @return the install devices by operate user

    */

   @PostMapping("myRelease")

   @RequestMapping("myRelease")

   public AppData<List<Device>> getInstallDevicesByOperateUser(@RequestParam(value="uid", required=true)Integer uid, 

         @RequestParam(defaultValue="0")Integer pageIndex, @RequestParam(defaultValue="0")Integer pageSize) {

      List<Device> devices = deviceService.getInstallDevicesByOperateUser(uid, pageIndex, pageSize);

@@ -108,10 +107,13 @@
    * @param mac the mac

    * @return the device by mac

    */

   @PostMapping("getEquInfoByMac")

   public AppData<Device> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {

      Device device = deviceService.getDeviceByMac(mac);

      return new AppData<Device>(device);

   @RequestMapping("getEquInfoByMac")

   public AppData<Map> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {

      Device device = deviceService.getDeviceByMac(mac,false);//不从缓存取

      Map<String,Object> deviceMap = new HashMap<>(BeanMap.create(device));

      deviceMap.put("monitorpointDetail",deviceMap.get("monitorPoint"));

      deviceMap.remove("monitorPoint");

      return new AppData<Map>(deviceMap);

   }



   /**

@@ -120,7 +122,7 @@
    * @param request the area name

    * @return the monitor points by area name

    */

   @PostMapping("getMpointsByAreaName")

   @RequestMapping("getMpointsByAreaName")

   public AppData<List<MonitorPoint>> getMonitorPointsByAreaName(HttpServletRequest request) {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByAreaName(parameters);

@@ -133,7 +135,7 @@
    * @param request the area name

    * @return the organizations by area name

    */

   @PostMapping("getOrgsByAreaName")

   @RequestMapping("getOrgsByAreaName")

   public AppData<List<Organization>> getOrganizationsByAreaName(HttpServletRequest request) {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      List<Organization> organizations = organizationService.getOrganizationsByAreaName(parameters);

@@ -146,7 +148,7 @@
    * @param mobile

    * @return

    */

   @PostMapping("sendSms")

   @RequestMapping("sendSms")

   public AppData<String> sendSms(String mobile) {

      AppData apiData = new AppData();



@@ -190,12 +192,13 @@
   }



   /**

    * Send SMS

    *

    * @param mobile

    * @param username

    * @param password

    * @param code

    * @return

    */

   @PostMapping("password")

   @RequestMapping("password")

   public AppData<String> password(String username, String password, String code){

      AppData apiData = new AppData();



@@ -229,4 +232,11 @@
         return  apiData;

      }

   }



   @RequestMapping("profession")

   public AppData<List<Profession>> profession(){



      List<Profession> professions = professionService.getProfessiontList();

      return new AppData<List<Profession>>(professions);

   }

}