Merge branch 'dev' of yeshijie/jw2.0 into dev

app/app-iot-server/src/main/java/com/yihu/ehr/iot/constant/ServiceApi.java

@@ -61,6 +61,8 @@ public class ServiceApi {
        public static final String GetDeviceById = Base +"getDeviceById";
        public static final String QueryDevicePage = Base +"queryDevicePage";
        public static final String GetDeviceList = Base +"getDeviceList";
        public static final String DelDevice = Base +"delDevice";
        public static final String UpdDevice = Base +"updDevice";
        public static final String IsSnExist = Base +"isSnExist";
        public static final String IsSimExist = Base +"isSimExist";
@@ -79,6 +81,7 @@ public class ServiceApi {
        public static final String FindPage = Base +"findPage";
        public static final String FindById = Base +"findById";
        public static final String DelOrder = Base +"delOrder";
        public static final String DelPurchase = Base +"delPurchase";
        public static final String UpdOrder = Base +"updOrder";
        public static final String CreateOrder = Base +"createOrder";

app/app-iot-server/src/main/java/com/yihu/ehr/iot/controller/device/IotDeviceController.java

@@ -75,6 +75,31 @@ public class IotDeviceController extends BaseController{
        }
    }
    @PostMapping(value = IotRequestMapping.Device.api_delete)
    @ApiOperation(value = "删除设备", notes = "删除设备")
    public Envelop<IotDeviceVO> delDevice(@ApiParam(name = "id", value = "id")
                                          @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return deviceService.delDevice(id);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = IotRequestMapping.Device.api_update)
    @ApiOperation(value = "修改设备", notes = "修改设备")
    public BaseEnvelop updDevice(@ApiParam(name = "jsonData", value = "", defaultValue = "")
                                 @RequestParam String jsonData) {
        try {
            return deviceService.updDevice(jsonData);
        } catch (Exception e) {
            e.printStackTrace();
            return BaseEnvelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = IotRequestMapping.Device.updSim)
    @ApiOperation(value = "修改sim卡号", notes = "修改sim卡号")
    public BaseEnvelop updSim(@ApiParam(name = "sim", value = "sim")

app/app-iot-server/src/main/java/com/yihu/ehr/iot/controller/device/IotDeviceOrderController.java

@@ -83,6 +83,18 @@ public class IotDeviceOrderController extends BaseController {
        }
    }
    @PostMapping(value = IotRequestMapping.DeviceOrder.delPurchase)
    @ApiOperation(value = "删除采购订单", notes = "删除采购订单")
    public Envelop<IotOrderPurchaseVO> delPurchase(@ApiParam(name = "id", value = "id")
                                                   @RequestParam(value = "id", required = true) String id) {
        try {
            return deviceOrderService.delPurchase(id);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = IotRequestMapping.DeviceOrder.updOrder)
    @ApiOperation(value = "修改订单", notes = "修改订单")
    public Envelop<IotOrderVO> updOrder(@ApiParam(name = "jsonData", value = "json", defaultValue = "")

app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/device/DeviceOrderService.java

@@ -82,6 +82,20 @@ public class DeviceOrderService extends BaseService{
        return envelop;
    }
    /**
     * 删除采购订单
     * @param id
     * @return
     * @throws IOException
     */
    public Envelop<IotOrderPurchaseVO> delPurchase(String id) throws IOException {
        Map<String, Object> params = new HashMap<>();
        params.put("id", id);
        HttpResponse response = HttpHelper.post(iotUrl + ServiceApi.DeviceOrder.DelPurchase, params);
        Envelop<IotOrderPurchaseVO> envelop = objectMapper.readValue(response.getBody(),Envelop.class);
        return envelop;
    }
    /**
     * 修改订单
     * @param jsonData

app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/device/DeviceService.java

@@ -16,13 +16,8 @@ import com.yihu.jw.restmodel.iot.common.ExistVO;
import com.yihu.jw.restmodel.iot.device.IotDeviceImportRecordVO;
import com.yihu.jw.restmodel.iot.device.IotDeviceImportVO;
import com.yihu.jw.restmodel.iot.device.IotDeviceVO;
import com.yihu.jw.rm.iot.IotRequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@@ -45,8 +40,7 @@ public class DeviceService extends BaseService{
     * @return
     * @throws IOException
     */
    public Envelop<IotDeviceVO> create(@ApiParam(name = "json_data", value = "", defaultValue = "")
                          @RequestBody String jsonData) throws IOException {
    public Envelop<IotDeviceVO> create(String jsonData) throws IOException {
        Map<String, Object> params = new HashMap<>();
        params.put("jsonData", jsonData);
        HttpResponse response = HttpHelper.post(iotUrl + ServiceApi.Device.CreateDevice, params);
@@ -60,8 +54,6 @@ public class DeviceService extends BaseService{
     * @return
     * @throws IOException
     */
    @GetMapping(value = IotRequestMapping.Device.api_getById)
    @ApiOperation(value = "根据code查找设备", notes = "根据code查找设备")
    public Envelop<IotDeviceVO> findByCode(String id)throws IOException{
        Map<String, Object> params = new HashMap<>();
        params.put("id", id);
@@ -107,7 +99,34 @@ public class DeviceService extends BaseService{
    public BaseEnvelop updSim(String sim,String id) throws IOException{
        Map<String, Object> params = new HashMap<>();
        params.put("sim", sim);
        HttpResponse response = HttpHelper.get(iotUrl + ServiceApi.Device.UpdSim, params);
        params.put("id", id);
        HttpResponse response = HttpHelper.post(iotUrl + ServiceApi.Device.UpdSim, params);
        BaseEnvelop envelop = objectMapper.readValue(response.getBody(),BaseEnvelop.class);
        return envelop;
    }
    /**
     * 删除
     * @param id
     * @return
     */
    public Envelop<IotDeviceVO> delDevice(String id) throws IOException{
        Map<String, Object> params = new HashMap<>();
        params.put("id", id);
        HttpResponse response = HttpHelper.post(iotUrl + ServiceApi.Device.DelDevice, params);
        Envelop<IotDeviceVO> envelop = objectMapper.readValue(response.getBody(),Envelop.class);
        return envelop;
    }
    /**
     * 修改设备
     * @param jsonData
     * @return
     */
    public BaseEnvelop updDevice(String jsonData) throws IOException{
        Map<String, Object> params = new HashMap<>();
        params.put("jsonData", jsonData);
        HttpResponse response = HttpHelper.post(iotUrl + ServiceApi.Device.UpdDevice, params);
        BaseEnvelop envelop = objectMapper.readValue(response.getBody(),BaseEnvelop.class);
        return envelop;
    }

common/common-fegin/src/main/java/com/yihu/jw/fegin/fallbackfactory/iot/device/IotDeviceFallbackFactory.java

@@ -42,6 +42,21 @@ public class IotDeviceFallbackFactory implements FallbackFactory<IotDeviceFeign>
                return null;
            }
            @Override
            public Envelop<IotDeviceVO> delDevice(@RequestParam(value = "id", required = true) String id
            ) {
                tracer.getCurrentSpan().logEvent("删除设备失败:原因:" + e.getMessage());
                tracer.getCurrentSpan().logEvent("id:" + id);
                return null;
            }
            @Override
            public BaseEnvelop updDevice(@RequestParam String jsonData) {
                tracer.getCurrentSpan().logEvent("修改设备失败:原因:" + e.getMessage());
                tracer.getCurrentSpan().logEvent("jsonData:" + jsonData);
                return null;
            }
            @Override
            public Envelop<ExistVO> isSnExist(@RequestParam(value = "sn", required = true) String sn
            ) {

common/common-fegin/src/main/java/com/yihu/jw/fegin/fallbackfactory/iot/device/IotDeviceOrderFallbackFactory.java

@@ -59,6 +59,13 @@ public class IotDeviceOrderFallbackFactory implements FallbackFactory<IotDeviceO
                return null;
            }
            @Override
            public Envelop<IotOrderPurchaseVO> delPurchase(@RequestParam(value = "id", required = true) String id) {
                tracer.getCurrentSpan().logEvent("删除采购订单失败:原因:" + e.getMessage());
                tracer.getCurrentSpan().logEvent("id:" + id);
                return null;
            }
            @Override
            public Envelop<IotOrderVO> updOrder(@RequestParam(value = "jsonData", required = false)String jsonData) {
                tracer.getCurrentSpan().logEvent("修改订单失败:原因:" + e.getMessage());

common/common-fegin/src/main/java/com/yihu/jw/fegin/iot/device/IotDeviceFeign.java

@@ -59,4 +59,9 @@ public interface IotDeviceFeign{
           @RequestParam(value = "page", required = false) Integer page,
           @RequestParam(value = "size", required = false) Integer size);
    @PostMapping(value = IotRequestMapping.Device.api_delete)
    Envelop<IotDeviceVO> delDevice(@RequestParam(value = "id", required = true) String id);
    @PostMapping(value = IotRequestMapping.Device.api_update)
    BaseEnvelop updDevice(@RequestParam(value = "jsonData", required = true) String jsonData);
}

common/common-fegin/src/main/java/com/yihu/jw/fegin/iot/device/IotDeviceOrderFeign.java

@@ -24,26 +24,29 @@ import org.springframework.web.bind.annotation.RequestParam;
public interface IotDeviceOrderFeign {
    @PostMapping(value = IotRequestMapping.DeviceOrder.createOrder)
    public Envelop<IotOrderVO> create(@RequestParam(value = "jsonData", required = true) String jsonData);
    Envelop<IotOrderVO> create(@RequestParam(value = "jsonData", required = true) String jsonData);
    @GetMapping(value = IotRequestMapping.DeviceOrder.findById)
    public Envelop<IotDeviceOrderVO> findByCode(@RequestParam(value = "id", required = true) String id);
    Envelop<IotDeviceOrderVO> findByCode(@RequestParam(value = "id", required = true) String id);
    @GetMapping(value = IotRequestMapping.DeviceOrder.findPage)
    public Envelop<IotDeviceOrderVO> findPage(
    Envelop<IotDeviceOrderVO> findPage(
            @RequestParam(value = "name", required = false) String name,
            @RequestParam(value = "type", required = false) String type,
            @RequestParam(value = "page", required = false) Integer page,
            @RequestParam(value = "size", required = false) Integer size);
    @PostMapping(value = IotRequestMapping.DeviceOrder.delOrder)
    public Envelop<IotDeviceOrderVO> delOrder(@RequestParam(value = "id", required = true) String id);
    Envelop<IotDeviceOrderVO> delOrder(@RequestParam(value = "id", required = true) String id);
    @PostMapping(value = IotRequestMapping.DeviceOrder.delPurchase)
    Envelop<IotOrderPurchaseVO> delPurchase(@RequestParam(value = "id", required = true) String id);
    @PostMapping(value = IotRequestMapping.DeviceOrder.updOrder)
    public Envelop<IotOrderVO> updOrder(@RequestParam(value = "jsonData", required = false)String jsonData);
    Envelop<IotOrderVO> updOrder(@RequestParam(value = "jsonData", required = false)String jsonData);
    @GetMapping(value = IotRequestMapping.DeviceOrder.findPurcharsePage)
    public Envelop<IotOrderPurchaseVO> findPurcharsePage(
    Envelop<IotOrderPurchaseVO> findPurcharsePage(
            @RequestParam(value = "orderId", required = true) String orderId,
            @RequestParam(value = "page", required = false) Integer page,
            @RequestParam(value = "size", required = false) Integer size);

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -157,9 +157,9 @@ public class IotRequestMapping {
     */
    public static class Device{
        public static final String api_create = "createDevice";
        public static final String api_delete = "device";
        public static final String api_delete = "delDevice";
        public static final String api_getById = "getDeviceById";
        public static final String api_update = "device";
        public static final String api_update = "updDevice";
        public static final String api_queryPage = "queryDevicePage";
        public static final String api_getList = "getDeviceList";
@@ -174,6 +174,7 @@ public class IotRequestMapping {
        public static final String message_success_update = "device update success";
        public static final String message_success_delete = "device delete success";
        public static final String message_success_find = "device find success";
        public static final String del_message_fail = "该设备已绑定居民，不允许删除";
        public static final String message_success_create = "device create success";
        public static final String message_success_find_functions = "device find success";
@@ -186,6 +187,7 @@ public class IotRequestMapping {
        public static final String findPage = "findPage";
        public static final String findById = "findById";
        public static final String delOrder = "delOrder";
        public static final String delPurchase = "delPurchase";
        public static final String updOrder = "updOrder";
        public static final String createOrder = "createOrder";
@@ -205,6 +207,8 @@ public class IotRequestMapping {
        public static final String message_success_find = "deviceOrder find success";
        public static final String message_success_create = "deviceOrder create success";
        public static final String message_success_find_functions = "deviceOrder find success";
        public static final String delete_order_fail_message_device = "该订单有关联设备，不允许删除";
        public static final String delete_purchase_fail_message_device = "该采购清单有关联设备，不允许删除";
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/common/base/BaseEnvelop.java

@@ -1,7 +1,6 @@
package com.yihu.jw.restmodel.common.base;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -64,6 +63,7 @@ public class BaseEnvelop {
    public static BaseEnvelop getSuccess(String message) {
        BaseEnvelop envelop = new BaseEnvelop();
        envelop.setSuccessMsg(message);
        envelop.setStatus(200);
        return envelop;
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceController.java

@@ -48,7 +48,7 @@ public class IotDeviceController extends EnvelopRestController{
    @PostMapping(value = IotRequestMapping.Device.api_create)
    @ApiOperation(value = "创建设备", notes = "创建设备")
    public Envelop<IotDeviceVO> create(@ApiParam(name = "json_data", value = "", defaultValue = "")
    public Envelop<IotDeviceVO> create(@ApiParam(name = "jsonData", value = "", defaultValue = "")
                          @RequestParam String jsonData) {
        try {
            IotDeviceDO iotDevice = toEntity(jsonData, IotDeviceDO.class);
@@ -69,6 +69,36 @@ public class IotDeviceController extends EnvelopRestController{
        }
    }
    @PostMapping(value = IotRequestMapping.Device.api_delete)
    @ApiOperation(value = "删除设备", notes = "删除设备")
    public Envelop<IotDeviceVO> delDevice(@ApiParam(name = "id", value = "id")
                                           @RequestParam(value = "id", required = true) String id
    ) {
        try {
            Integer re = iotDeviceService.delDevice(id);
            if(re==1){
                return Envelop.getSuccess(IotRequestMapping.Device.message_success_find);
            }else {
                return Envelop.getError(IotRequestMapping.Device.del_message_fail);
            }
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = IotRequestMapping.Device.api_update)
    @ApiOperation(value = "修改设备", notes = "修改设备")
    public BaseEnvelop updDevice(@ApiParam(name = "jsonData", value = "", defaultValue = "")
                                     @RequestParam String jsonData) {
        try {
            IotDeviceVO iotDevice = toEntity(jsonData, IotDeviceVO.class);
            return iotDeviceService.updDevice(iotDevice);
        } catch (Exception e) {
            e.printStackTrace();
            return BaseEnvelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = IotRequestMapping.Device.api_getById)
    @ApiOperation(value = "根据code查找设备", notes = "根据code查找设备")

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceOrderController.java

@@ -101,13 +101,34 @@ public class IotDeviceOrderController extends EnvelopRestController{
        }
    }
    @PostMapping(value = IotRequestMapping.DeviceOrder.delPurchase)
    @ApiOperation(value = "删除采购订单", notes = "删除采购订单")
    public Envelop<IotOrderPurchaseVO> delPurchase(@ApiParam(name = "id", value = "id")
                                              @RequestParam(value = "id", required = true) String id) {
        try {
            Integer re =  iotDeviceOrderService.delPurchase(id);
            if(re==1){
                return Envelop.getSuccess(IotRequestMapping.DeviceOrder.message_success_find);
            }else {
                return Envelop.getError(IotRequestMapping.DeviceOrder.delete_purchase_fail_message_device);
            }
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @PostMapping(value = IotRequestMapping.DeviceOrder.delOrder)
    @ApiOperation(value = "删除订单", notes = "删除订单")
    public Envelop<IotDeviceOrderVO> delOrder(@ApiParam(name = "id", value = "id")
                                            @RequestParam(value = "id", required = true) String id) {
        try {
            iotDeviceOrderService.delOrder(id);
            return Envelop.getSuccess(IotRequestMapping.DeviceOrder.message_success_find);
            Integer re =  iotDeviceOrderService.delOrder(id);
            if(re==1){
                return Envelop.getSuccess(IotRequestMapping.DeviceOrder.message_success_find);
            }else {
                return Envelop.getError(IotRequestMapping.DeviceOrder.delete_order_fail_message_device);
            }
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceDao.java

@@ -29,4 +29,7 @@ public interface IotDeviceDao extends PagingAndSortingRepository<IotDeviceDO, St
    @Query("from IotDeviceDO w where w.purchaseId =?1 and w.del=1")
    List<IotDeviceDO> findListByPurchaseId(String purchaseId);
    @Query("from IotDeviceDO w where w.orderId =?1 and w.del=1")
    List<IotDeviceDO> findListByOrderId(String orderId);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotPatientDeviceDao.java

@@ -23,6 +23,9 @@ public interface IotPatientDeviceDao extends PagingAndSortingRepository<IotPatie
    @Query("from IotPatientDeviceDO a where a.deviceSn = ?1 and a.del=1 ")
    List<IotPatientDeviceDO> findByDeviceSn(String deviceSn);
    @Query("from IotPatientDeviceDO a where a.deviceId = ?1 and a.del=1 ")
    List<IotPatientDeviceDO> findByDeviceId(String deviceId);
    @Query("from IotPatientDeviceDO a where a.patient = ?1 and a.deviceSn=?2 and a.del=1")
    List<IotPatientDeviceDO> findByPatientAndDeviceSn(String patient,String deviceSn);

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyCertificateService.java

@@ -52,19 +52,16 @@ public class IotCompanyCertificateService extends BaseJpaService<IotCompanyCerti
     * @throws ParseException
     */
    public Envelop<IotCompanyCertificateVO> queryPage(Integer page, Integer size,String name,String companyId) throws ParseException {
        String filters = "";
        String filters = "del=1;";
        String semicolon = "";
        if(StringUtils.isNotBlank(companyId)){
            filters = "companyId="+companyId;
            filters += "companyId="+companyId;
            semicolon = ";";
        }
        if(StringUtils.isNotBlank(name)){
            filters = "name?"+name;
            filters += semicolon+"name?"+name;
            semicolon = ";";
        }
        if(StringUtils.isBlank(filters)){
            filters+= semicolon + "del=1";
        }
        String sorts = "-updateTime";
        //得到list数据
        List<IotCompanyCertificateDO> list = search(null, filters, sorts, page, size);

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -49,19 +49,16 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
     * @throws ParseException
     */
    public Envelop<IotCompanyVO> queryPage(Integer page,Integer size,String status,String name) throws ParseException {
        String filters = "";
        String filters = "del=1;";
        String semicolon = "";
        if(StringUtils.isNotBlank(name)){
            filters = "name?"+name+" g1;contactsName?"+name+" g1";
            filters += "name?"+name+" g1;contactsName?"+name+" g1";
            semicolon = ";";
        }
        if(StringUtils.isNotBlank(status)){
            filters += semicolon +"status="+status;
            semicolon = ";";
        }
        if(StringUtils.isBlank(filters)){
            filters+= semicolon + "del=1";
        }
        String sorts = "-updateTime";
        //得到list数据
        List<IotCompanyDO> list = search(null, filters, sorts, page, size);
@@ -156,8 +153,8 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
            args.add(name);
        }
        if(StringUtils.isNotBlank(type)){
            sql.append(" and t.type=? ");
            sqlCount.append(" and t.type='").append(type).append("' ");
            sql.append(" and c.id = t.company_id and t.type=? ");
            sqlCount.append(" and c.id = t.company_id and t.type='").append(type).append("' ");
            args.add(type);
        }
        sql.append("order by c.update_time desc limit ").append((page-1)*size).append(",").append(size);

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceOrderService.java

@@ -8,6 +8,7 @@ import com.yihu.iot.dao.device.IotDeviceQualityInspectionPlanDao;
import com.yihu.iot.dao.device.IotOrderPurchaseDao;
import com.yihu.iot.service.dict.IotSystemDictService;
import com.yihu.jw.iot.company.IotCompanyTypeDO;
import com.yihu.jw.iot.device.IotDeviceDO;
import com.yihu.jw.iot.device.IotDeviceOrderDO;
import com.yihu.jw.iot.device.IotOrderPurchaseDO;
import com.yihu.jw.restmodel.common.Envelop;
@@ -25,7 +26,10 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * @author yeshijie on 2017/12/8.
@@ -123,13 +127,39 @@ public class IotDeviceOrderService extends BaseJpaService<IotDeviceOrderDO,IotDe
    }
    /**
     * 删除
     * 删除采购订单
     * @param id
     */
    public void delOrder(String id){
    public int delPurchase(String id){
        int re = 1;
        IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(id);
        List<IotDeviceDO> deviceDOList = iotDeviceDao.findListByPurchaseId(id);
        if(deviceDOList!=null&&deviceDOList.size()>0){
            //有关联设备不能删除
            re = -1;
        }else {
            purchaseDO.setDel(0);
            iotOrderPurchaseDao.save(purchaseDO);
        }
        return re;
    }
    /**
     * 删除订单
     * @param id
     */
    public int delOrder(String id){
        int re = 1;
        IotDeviceOrderDO order = iotDeviceOrderDao.findById(id);
        order.setDel(0);
        iotDeviceOrderDao.save(order);
        List<IotDeviceDO> deviceDOList = iotDeviceDao.findListByOrderId(id);
        if(deviceDOList!=null&&deviceDOList.size()>0){
            //有关联设备不能删除
            re = -1;
        }else {
            order.setDel(0);
            iotDeviceOrderDao.save(order);
        }
       return re;
    }
    /**
@@ -150,14 +180,19 @@ public class IotDeviceOrderService extends BaseJpaService<IotDeviceOrderDO,IotDe
        iotDeviceOrderDO.setSaasId(iotDeviceOrderDOOld.getSaasId());
        iotDeviceOrderDO.setDel(1);
        iotDeviceOrderDO.setYmd(iotDeviceOrderDOOld.getYmd());
        iotDeviceOrderDO.setPurchaseTime(DateUtil.strToDate(iotDeviceOrderVO.getPurchaseTime()));
        iotDeviceOrderDao.save(iotDeviceOrderDO);
        //采购清单
        orderPurchaseDOList.forEach(purchase->{
            IotOrderPurchaseDO purchaseDOOld = iotOrderPurchaseDao.findById(purchase.getId());
            purchase.setDel(1);
            purchase.setOrderId(purchaseDOOld.getOrderId());
            purchase.setOrderNo(purchaseDOOld.getOrderNo());
            purchase.setSaasId(purchaseDOOld.getSaasId());
            purchase.setOrderId(iotDeviceOrderDOOld.getId());
            purchase.setOrderNo(iotDeviceOrderDOOld.getOrderNo());
            if(StringUtils.isNotBlank(purchase.getId())){
                IotOrderPurchaseDO purchaseDOOld = iotOrderPurchaseDao.findById(purchase.getId());
                purchase.setSaasId(purchaseDOOld.getSaasId());
            }else {
                purchase.setSaasId(getCode());
            }
        });
        iotOrderPurchaseDao.save(orderPurchaseDOList);
    }

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceService.java

@@ -67,6 +67,7 @@ public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
            IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(iotDevice.getPurchaseId());
            iotDevice.setName(purchaseDO.getDeviceName());
            iotDevice.setOrderNo(purchaseDO.getOrderNo());
            iotDevice.setOrderId(purchaseDO.getOrderId());
            iotDevice.setProductId(purchaseDO.getProductId());
            iotDevice.setSupplierId(purchaseDO.getSupplierId());
            iotDevice.setSupplierName(purchaseDO.getSupplierName());
@@ -96,6 +97,39 @@ public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
        return iotDeviceDao.findById(id);
    }
    /**
     * 删除设备
     * @param id
     * @return
     */
    public int delDevice(String id){
        int re = 1;
        IotDeviceDO deviceDO = iotDeviceDao.findById(id);
        List<IotPatientDeviceDO> patientDeviceDOList = iotPatientDeviceDao.findByDeviceId(id);
        if(patientDeviceDOList!=null&&patientDeviceDOList.size()>0){
            re = -1;
        }else {
            deviceDO.setDel(0);
            iotDeviceDao.save(deviceDO);
        }
        return re;
    }
    /**
     * 修改设备
     * @param deviceVO
     * @return
     */
    public BaseEnvelop updDevice(IotDeviceVO deviceVO){
        IotDeviceDO deviceDO = iotDeviceDao.findById(deviceVO.getId());
        deviceDO.setSimNo(deviceVO.getSimNo());
        deviceDO.setDeviceSn(deviceVO.getDeviceSn());
        deviceDO.setHospitalName(deviceVO.getHospitalName());
        deviceDO.setHospital(deviceVO.getHospital());
        iotDeviceDao.save(deviceDO);
        return BaseEnvelop.getSuccess("修改成功");
    }
    /**
     * 按sim卡号查找
     * @param simNo

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceController.java

@@ -33,6 +33,21 @@ public class IotDeviceController extends EnvelopRestController{
        return iotDeviceFeign.create(jsonData);
    }
    @PostMapping(value = IotRequestMapping.Device.api_delete)
    @ApiOperation(value = "删除设备", notes = "删除设备")
    public Envelop<IotDeviceVO> delDevice(@ApiParam(name = "id", value = "id")
                                          @RequestParam(value = "id", required = true) String id
    ) {
        return iotDeviceFeign.delDevice(id);
    }
    @PostMapping(value = IotRequestMapping.Device.api_update)
    @ApiOperation(value = "修改设备", notes = "修改设备")
    public BaseEnvelop updDevice(@ApiParam(name = "jsonData", value = "", defaultValue = "")
                                 @RequestParam String jsonData) {
        return iotDeviceFeign.updDevice(jsonData);
    }
    @GetMapping(value = IotRequestMapping.Device.api_getById)
    @ApiOperation(value = "根据code查找设备", notes = "根据code查找设备")

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceOrderController.java

@@ -59,6 +59,13 @@ public class IotDeviceOrderController extends EnvelopRestController{
        return iotDeviceOrderFeign.delOrder(id);
    }
    @PostMapping(value = IotRequestMapping.DeviceOrder.delPurchase)
    @ApiOperation(value = "删除采购订单", notes = "删除采购订单")
    public Envelop<IotOrderPurchaseVO> delPurchase(@ApiParam(name = "id", value = "id")
                                                   @RequestParam(value = "id", required = true) String id) {
        return iotDeviceOrderFeign.delPurchase(id);
    }
    @PostMapping(value = IotRequestMapping.DeviceOrder.updOrder)
    @ApiOperation(value = "修改订单", notes = "修改订单")
    public Envelop<IotOrderVO> updOrder(@ApiParam(name = "jsonData", value = "json", defaultValue = "")