新增设备管理接口

common/common-entity/src/main/java/com/yihu/jw/entity/iot/equipment/IotEquipmentDetailDO.java

@@ -6,7 +6,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "iot_equipment_detail")
@Table(name = "iot_equipmet_detail")
public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
    /*
     *设备名称
@@ -61,6 +61,30 @@ public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
     *所属区域
     */
    private String belongAre;
    /*
     *经度
     */
    private String longitude;
    /*
     *纬度
     */
    private String latitude;
    public String getLongitude() {
        return longitude;
    }
    public void setLongitude(String longitude) {
        this.longitude = longitude;
    }
    public String getLatitude() {
        return latitude;
    }
    public void setLatitude(String latitude) {
        this.latitude = latitude;
    }
    public String getDeviceName() {
        return deviceName;

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1017,6 +1017,17 @@ public class BaseHospitalRequestMapping {
        public static final String setDefault  = "/setDefault";
        public static final String hasDefault  = "/hasDefault";
    }
    /**
     * 设备管理
     */
    public static class IotEquipmentManage extends Basic {
        public static final String equipmentManage  = "/equipmentManage";
        public static final String createEquipment  = "/createEquipment";
        public static final String updateEquipment  = "/updateEquipment";
        public static final String deleteEquipment  = "/deleteEquipment";
        public static final String getEquipment  = "/getEquipment";
    }
    
    /**
     * 健康文章

svr/svr-iot/src/main/java/com/yihu/iot/controller/equipment/IotEquipmentController.java

@@ -0,0 +1,64 @@
package com.yihu.iot.controller.equipment;
import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.service.equipment.IotEqtDetailService;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.iot.equipment.IotEquipmentDetailDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.IotEquipmentManage.equipmentManage)
public class IotEquipmentController extends EnvelopRestEndpoint {
    @Autowired
    private IotEqtDetailService iotEqtDetailService;
    @PostMapping(value = BaseHospitalRequestMapping.IotEquipmentManage.getEquipment)
    @ApiOperation(value = "查询设备")
    public Envelop queryEquipment(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
            @RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
            @ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
            @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize) throws Exception{
        List<IotEquipmentDetailDO> equipmentDetailDOS = iotEqtDetailService.search(fields,filters,sorts,page,pageSize);
        if (equipmentDetailDOS.size()>=0){
            return success(equipmentDetailDOS);
        }else {
            return failed("查询失败");
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.IotEquipmentManage.deleteEquipment)
    @ApiOperation(value = "根据id删除设备")
    public Envelop removeEquipment(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id", required = true)String id) throws Exception{
        iotEqtDetailService.deleteEquipment(id);
        return success("删除成功");
    }
    @GetMapping(value = BaseHospitalRequestMapping.IotEquipmentManage.updateEquipment)
    @ApiOperation(value = "更新/新增设备")
    public Envelop updateEquipment(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception{
        iotEqtDetailService.updateEquipment(jsonData);
        return success("更新成功");
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/equipment/IotEqtDetailService.java

@@ -1,35 +1,46 @@
package com.yihu.iot.service.equipment;
import com.yihu.iot.dao.equipment.IotEquipmentDetailDao;
import com.yihu.iot.model.BaseResultModel;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import com.yihu.iot.util.excel.EntityUtils;
import com.yihu.jw.entity.iot.equipment.IotEquipmentDetailDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.UUID;
@Service
public class IotEqtDetailService  extends BaseJpaService<IotEquipmentDetailDO, IotEquipmentDetailDao> {
    @Autowired
    private IotEquipmentDetailDao iotEquipmentDetailDao;
    public void updateEquipment(IotEquipmentDetailDO iotEquipmentDetailDO){
       IotEquipmentDetailDO io =  iotEquipmentDetailDao.findOne(iotEquipmentDetailDO.getId());
       if(null!=io){
         io.setAddress(iotEquipmentDetailDO.getAddress());
         io.setApplicantName(iotEquipmentDetailDO.getApplicantName());
         io.setApplicantTel(iotEquipmentDetailDO.getApplicantTel());
         io.setBelongAre(iotEquipmentDetailDO.getBelongAre());
         io.setDeviceCode(iotEquipmentDetailDO.getDeviceCode());
         io.setDeviceModel(iotEquipmentDetailDO.getDeviceModel());
         io.setDeviceName(iotEquipmentDetailDO.getDeviceModel());
         io.setLocalAdd(iotEquipmentDetailDO.getLocalAdd());
         io.setManufacturer(iotEquipmentDetailDO.getManufacturer());
         io.setManufacturerCode(iotEquipmentDetailDO.getManufacturerCode());
         io.setNeighborhoodCommitteeCode(iotEquipmentDetailDO.getNeighborhoodCommitteeCode());
         io.setNeighborhoodCommitteeName(iotEquipmentDetailDO.getNeighborhoodCommitteeName());
         io.setRepresentative(iotEquipmentDetailDO.getRepresentative());
         iotEquipmentDetailDao.save(io);
       }
    public void updateEquipment(String jsonData){
        IotEquipmentDetailDO iotEquipmentDetailDO = EntityUtils.jsonToEntity(jsonData, IotEquipmentDetailDO.class);
        if(null==iotEquipmentDetailDO.getId()){
            //新增
            iotEquipmentDetailDO.setId(UUID.randomUUID().toString());
            iotEquipmentDetailDO.setCreateTime(new Date());
            iotEquipmentDetailDao.save(iotEquipmentDetailDO);
        }else {
           IotEquipmentDetailDO iotEquipmentDetailDO1 = iotEquipmentDetailDao.findOne(iotEquipmentDetailDO.getId());
            iotEquipmentDetailDO1.setAddress(iotEquipmentDetailDO1.getAddress());
            iotEquipmentDetailDO1.setApplicantName(iotEquipmentDetailDO.getApplicantName());
            iotEquipmentDetailDO1.setApplicantTel(iotEquipmentDetailDO.getApplicantTel());
            iotEquipmentDetailDO1.setBelongAre(iotEquipmentDetailDO.getBelongAre());
            iotEquipmentDetailDO1.setDeviceCode(iotEquipmentDetailDO.getDeviceCode());
            iotEquipmentDetailDO1.setDeviceModel(iotEquipmentDetailDO.getDeviceModel());
            iotEquipmentDetailDO1.setDeviceName(iotEquipmentDetailDO.getDeviceName());
            iotEquipmentDetailDO1.setLocalAdd(iotEquipmentDetailDO.getLocalAdd());
            iotEquipmentDetailDO1.setManufacturer(iotEquipmentDetailDO.getManufacturer());
            iotEquipmentDetailDO1.setManufacturerCode(iotEquipmentDetailDO.getManufacturerCode());
            iotEquipmentDetailDO1.setNeighborhoodCommitteeCode(iotEquipmentDetailDO.getNeighborhoodCommitteeCode());
            iotEquipmentDetailDO1.setNeighborhoodCommitteeName(iotEquipmentDetailDO.getNeighborhoodCommitteeName());
            iotEquipmentDetailDO1.setRepresentative(iotEquipmentDetailDO.getRepresentative());
            iotEquipmentDetailDO1.setLatitude(iotEquipmentDetailDO.getLatitude());
            iotEquipmentDetailDO1.setLongitude(iotEquipmentDetailDO.getLongitude());
            iotEquipmentDetailDao.save(iotEquipmentDetailDO1);
        }
    }
    public void deleteEquipment(String id){
@@ -39,26 +50,5 @@ public class IotEqtDetailService  extends BaseJpaService<IotEquipmentDetailDO, I
        }
    }
    public void createEquipment(IotEquipmentDetailDO iotEquipmentDetailDO){
            IotEquipmentDetailDO io =  new IotEquipmentDetailDO();
            io.setAddress(iotEquipmentDetailDO.getAddress());
            io.setApplicantName(iotEquipmentDetailDO.getApplicantName());
            io.setApplicantTel(iotEquipmentDetailDO.getApplicantTel());
            io.setBelongAre(iotEquipmentDetailDO.getBelongAre());
            io.setDeviceCode(iotEquipmentDetailDO.getDeviceCode());
            io.setDeviceModel(iotEquipmentDetailDO.getDeviceModel());
            io.setDeviceName(iotEquipmentDetailDO.getDeviceModel());
            io.setLocalAdd(iotEquipmentDetailDO.getLocalAdd());
            io.setManufacturer(iotEquipmentDetailDO.getManufacturer());
            io.setManufacturerCode(iotEquipmentDetailDO.getManufacturerCode());
            io.setNeighborhoodCommitteeCode(iotEquipmentDetailDO.getNeighborhoodCommitteeCode());
            io.setNeighborhoodCommitteeName(iotEquipmentDetailDO.getNeighborhoodCommitteeName());
            io.setRepresentative(iotEquipmentDetailDO.getRepresentative());
            iotEquipmentDetailDao.save(io);
    }
    public void getEquipment(){
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/util/excel/EntityUtils.java

@@ -0,0 +1,35 @@
package com.yihu.iot.util.excel;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.ArrayList;
import java.util.List;
public class EntityUtils {
    protected static ObjectMapper objectMapper = new ObjectMapper();
    public static <T> T jsonToEntity(String json,Class<T> target){
        T entity = null;
        try {
            entity  = objectMapper.readValue(json,target);
        } catch (Exception e) {
           throw new RuntimeException("Json字符串转换成【"+target.getName()+"】实体类异常：" + e.getMessage());
        }
        return entity;
    }
    public static <T> List<T> jsonToList(String json, Class<T> target)throws Exception{
        com.alibaba.fastjson.JSONArray array = JSON.parseArray(json);
        List<T> list = new ArrayList<>();
        for(int i=0;i<array.size();i++){
            com.alibaba.fastjson.JSONObject object = (com.alibaba.fastjson.JSONObject)array.get(i);
            T t = objectMapper.readValue(object.toJSONString(),target);
            list.add(t);
        }
        return list;
    }
}